summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Clift <justin@gluster.org>2014-06-13 03:33:51 +0100
committerVijay Bellur <vbellur@redhat.com>2014-06-13 09:59:20 -0700
commit053389c89eb1c1937e795dd52f7c10a4a295b707 (patch)
tree6e7a6801446370e55c7949ca3b34f5573642118b
parent85055f8a909ed0c5ebb20dd2c1ed34e610c987fe (diff)
tests: add missing check for yajl to run-tests.sh
Also add it to the regression test Requires line, along with other missing dependencies. Change-Id: I2a83eb6797bafe8883d90565bb4c1ab93c074644 BUG: 1108958 Reviewed-on: http://review.gluster.org/8054 Reviewed-by: Harshavardhana <harsha@harshavardhana.net> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--glusterfs.spec.in2
-rwxr-xr-xrun-tests.sh5
2 files changed, 6 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 525822a53a9..a9061ced62a 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -403,7 +403,7 @@ Requires: %{name} = %{version}-%{release}
Requires: %{name}-fuse = %{version}-%{release}
Requires: %{name}-server = %{version}-%{release}
Requires: perl(App::Prove) perl(Test::Harness) gcc util-linux-ng lvm2
-Requires: python attr dbench git nfs-utils xfsprogs
+Requires: python attr dbench file git libacl-devel mock net-tools nfs-utils xfsprogs yajl
%description regression-tests
The Gluster Test Framework, is a suite of scripts used for
diff --git a/run-tests.sh b/run-tests.sh
index 1d8338bc81d..39aeab3b624 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -36,6 +36,11 @@ function check_dependencies()
MISSING="$MISSING perl-Test-Harness"
fi
+ # Check for YAJL
+ if [ ! -x /usr/bin/json_verify ]; then
+ MISSING="$MISSING yajl"
+ fi
+
# Check for XFS programs
env mkfs.xfs -V > /dev/null 2>&1
if [ $? -ne 0 ]; then