diff --git a/configure.ac b/configure.ac index 3a34720..7b49a39 100755 --- a/configure.ac +++ b/configure.ac @@ -245,6 +245,5 @@ AM_CONDITIONAL([USE_CAPS], [test x$enable_caps = xyes]) AC_CONFIG_FILES([Makefile src/Makefile contrib/Makefile - src/test/Makefile doc/Makefile]) AC_OUTPUT diff --git a/testing/docker/ubuntu14.04/Dockerfile b/testing/docker/ubuntu14.04/Dockerfile index 735178b..06f9326 100644 --- a/testing/docker/ubuntu14.04/Dockerfile +++ b/testing/docker/ubuntu14.04/Dockerfile @@ -3,4 +3,5 @@ FROM ubuntu:14.04 WORKDIR /data RUN apt-get update RUN apt-get install -y libopenmpi-dev openmpi-bin mpich git pkg-config gcc-4.7 nano make -RUN apt-get install -y sudo +RUN apt-get install -y sudo hdf5-tools libhdf5-mpi-dev + diff --git a/testing/docker/ubuntu14.04/run-test.sh b/testing/docker/ubuntu14.04/run-test.sh index b8d47c2..020cad0 100755 --- a/testing/docker/ubuntu14.04/run-test.sh +++ b/testing/docker/ubuntu14.04/run-test.sh @@ -14,8 +14,8 @@ function runTest(){ sudo -u testuser mkdir -p $BUILD/$FLAVOR pushd $BUILD/$FLAVOR > /dev/null - sudo -u testuser /data/configure || exit 1 - sudo -u testuser make || exit 1 + sudo -u testuser /data/configure --with-hdf5 CFLAGS=-I/usr/lib/x86_64-linux-gnu/hdf5/openmpi/include LDFLAGS=-L/usr/lib/x86_64-linux-gnu/hdf5/openmpi/lib|| exit 1 + sudo -u testuser make V=1 || exit 1 #define the alias ln -sf $(which mpiexec.$FLAVOR) /usr/bin/mpiexec