diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-22 17:09:29 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-22 17:09:29 +0200 |
| commit | 08c130efb235ac02602c0e31d67df6c9791e32bb (patch) | |
| tree | dea94817cb326656d6e1480cf9bb214ba2754748 /docker | |
| parent | 79c16fb8e00523596b1f86f97329f5346b55faab (diff) | |
Allow running valgrind on unit tests (disabled for now)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.build | 1 | ||||
| -rwxr-xr-x | docker/ci/vespa-ci-internal.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 1e89ce87bcb..ad989969bc5 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -8,6 +8,7 @@ RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vesp yum -y install git \ ccache \ rpm-build \ + valgrind \ sudo && \ echo "source /opt/rh/devtoolset-6/enable" > /etc/profile.d/devtoolset-6.sh && \ echo "* soft nproc 32768" > /etc/security/limits.d/90-nproc.conf diff --git a/docker/ci/vespa-ci-internal.sh b/docker/ci/vespa-ci-internal.sh index c1102476904..ff91002e032 100755 --- a/docker/ci/vespa-ci-internal.sh +++ b/docker/ci/vespa-ci-internal.sh @@ -30,6 +30,7 @@ cmake3 -DCMAKE_INSTALL_PREFIX=/opt/vespa \ -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/include/llvm3.9" \ -DCMAKE_BUILD_RPATH=/opt/vespa/lib64 \ + -DVALGRIND_UNIT_TESTS=no \ "${SOURCE_DIR}" make -j ${NUM_THREADS} ctest3 -j ${NUM_THREADS} |