test: install bc

pmem · Dec 11, 2017 · 9f5b024 · 9f5b024
1 parent e4a9b11
commit 9f5b024
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/src/test/unicode_api/TEST0 b/src/test/unicode_api/TEST0
@@ -56,6 +56,7 @@ FAILED=0
 DEF_COL=6
 
 function pick_col {
+	require_command bc
 	local ver=$(clang --version | grep version | sed "s/.*clang version \([0-9]*\)\.\([0-9]*\).*/\1*100+\2*10/" | bc)
 	if [ $ver -le 340 ]; then
 		DEF_COL=5

diff --git a/src/test/unittest/unittest.sh b/src/test/unittest/unittest.sh
@@ -1386,6 +1386,7 @@ function set_valgrind_exe_name() {
 #
 function valgrind_version() {
 	require_valgrind
+	require_command bc
 	$VALGRINDEXE --version | sed "s/valgrind-\([0-9]*\)\.\([0-9]*\).*/\1*100+\2/" | bc
 }
 

diff --git a/utils/docker/images/Dockerfile.fedora-25 b/utils/docker/images/Dockerfile.fedora-25
@@ -43,7 +43,7 @@ RUN dnf install -y git gcc clang openssh-server autoconf automake make \
 	wget tar lbzip2 passwd sudo pkgconfig findutils man libunwind-devel \
 	file rpm-build rpm-build-libs which fuse fuse-devel ncurses-devel \
 	libuv-devel glib2-devel libtool pandoc doxygen cmake gdb asciidoc \
-	kmod-devel xmlto libudev-devel libuuid-devel json-c-devel
+	kmod-devel xmlto libudev-devel libuuid-devel json-c-devel bc
 
 # Install libndctl
 COPY install-libndctl.sh install-libndctl.sh

diff --git a/utils/docker/images/Dockerfile.ubuntu-16.04 b/utils/docker/images/Dockerfile.ubuntu-16.04
@@ -44,7 +44,8 @@ RUN apt-get update && apt-get install -y software-properties-common \
 	devscripts pkg-config ssh git gcc clang debhelper sudo whois \
 	libc6-dbg libncurses5-dev libuv1-dev libfuse-dev libglib2.0-dev \
 	libtool pandoc doxygen graphviz clang-format-3.8 cmake ruby gdb \
-	libjson-c-dev asciidoc uuid-dev libkmod-dev libudev-dev
+	libjson-c-dev asciidoc uuid-dev libkmod-dev libudev-dev \
+	bc
 
 # Install valgrind
 COPY install-valgrind.sh install-valgrind.sh