From 80f20f8ed3e338b34e44fc0b554849d62a1444a0 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Sat, 20 Dec 2014 19:30:59 +0100 Subject: [PATCH] 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 --- run-make-check.sh | 2 +- src/test/centos.dockerfile | 2 +- src/test/ubuntu.dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run-make-check.sh b/run-make-check.sh index 2884cbf098756..7f369b7570e0a 100755 --- 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 d79a5ee8bc9e7..bea21e9245f62 100644 --- 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 dfab5f01905e3..4d1c669e6b239 100644 --- 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 -- 2.39.5