tests: run-make-check.sh install jq

jq is useful to parse json from the command line. It is however not
packaged for all supported distributions (precise has it in the backport
repository which is usually not active) and cannot be conveniently added
to debian/control because it targets all distributions and has no
conditionals.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/run-make-check.sh b/run-make-check.sh
index 2884cbf098756803e90f2a8b79361c13da470f5f..7f369b7570e0ac448cd6d19aabd9352343badf78 100755 (executable)
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -54,7 +54,7 @@ function maybe_enable_docker() {
 }
 
 function run() {
-    sudo $(which apt-get yum zypper 2>/dev/null) install ccache
+    sudo $(which apt-get yum zypper 2>/dev/null) install -y ccache jq
     sudo modprobe rbd
 
     if test -f ./install-deps.sh ; then

diff --git a/src/test/centos.dockerfile b/src/test/centos.dockerfile
index d79a5ee8bc9e7351538958545aa85fe9318f776e..bea21e9245f622256a3c8898c6c7c29383d371dc 100644 (file)
--- a/src/test/centos.dockerfile
+++ b/src/test/centos.dockerfile
@@ -40,4 +40,4 @@ RUN yum install -y make gcc-c++ libtool boost-devel bzip2-devel libedit-devel pe
 # development tools
 RUN yum install -y ccache valgrind gdb git
 # make check dependencies
-RUN yum install -y python-virtualenv gdisk kpartx hdparm
+RUN yum install -y python-virtualenv gdisk kpartx hdparm jq

diff --git a/src/test/ubuntu.dockerfile b/src/test/ubuntu.dockerfile
index dfab5f01905e353824422a3d7f28ec3c428eda73..4d1c669e6b2390365c1f0e571a8644ad239de647 100644 (file)
--- a/src/test/ubuntu.dockerfile
+++ b/src/test/ubuntu.dockerfile
@@ -27,4 +27,4 @@ RUN apt-get install -y autoconf automake autotools-dev libbz2-dev debhelper defa
 # development tools
 RUN apt-get install -y ccache valgrind gdb
 # make check dependencies
-RUN apt-get install -y python-virtualenv gdisk kpartx hdparm
+RUN apt-get install -y python-virtualenv gdisk kpartx hdparm jq