aboutsummaryrefslogtreecommitdiffstats
path: root/src/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripts')
-rwxr-xr-xsrc/scripts/ci/travis/build.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh
index f2b4f2b67..ec84499ce 100755
--- a/src/scripts/ci/travis/build.sh
+++ b/src/scripts/ci/travis/build.sh
@@ -7,6 +7,7 @@ TEST_PREFIX=""
TEST_EXE=./botan-test
CFG_FLAGS=(--prefix=/tmp/botan-installation --cc=$CC --os=$TRAVIS_OS_NAME)
+# PKCS11 is optional but doesn't pull in new dependencies
CFG_FLAGS+=(--with-pkcs11)
CC_BIN=$CXX
@@ -31,10 +32,10 @@ elif [ "$BUILD_MODE" = "coverage" ]; then
CFG_FLAGS+=(--with-coverage)
elif [ "$BUILD_MODE" = "sanitizer" ]; then
export ASAN_OPTIONS=detect_leaks=0
- CFG_FLAGS+=(--with-sanitizers)
+ CFG_FLAGS+=(--with-sanitizers --disable-modules=locking_allocator)
elif [ "$BUILD_MODE" = "valgrind" ]; then
- CFG_FLAGS+=(--with-valgrind --with-debug-info)
- TEST_PREFIX="valgrind --track-origins=yes --error-exitcode=9 -v"
+ CFG_FLAGS+=(--with-valgrind --with-debug-info --disable-modules=locking_allocator)
+ TEST_PREFIX="valgrind --error-exitcode=9 -v"
fi
if [ "$BUILD_MODE" = "mini-static" ] || [ "$BUILD_MODE" = "mini-shared" ]; then