diff --git a/.travis.yml b/.travis.yml index b619f9536e..8a0d9f48a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ services: cache: ccache: true directories: - - $TRAVIS_BUILD_DIR/ci/scratch/.ccache + - $BASE_BUILD_DIR/ci/scratch/.ccache # macOS - $HOME/Library/Caches/Homebrew - /usr/local/Homebrew @@ -158,7 +158,7 @@ install: - export PULL_REQUEST="$TRAVIS_PULL_REQUEST" - export COMMIT_RANGE="$TRAVIS_COMMIT_RANGE" - export JOB_NUMBER="$TRAVIS_JOB_NUMBER" - - export HOST_SRC_DIR=$TRAVIS_BUILD_DIR + - export HOST_SRC_DIR=$BASE_BUILD_DIR - export HOST_CACHE_DIR=$HOME/cache - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1` - source ./ci/matrix.sh diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 5fa21286ba..67dd609c03 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -36,9 +36,9 @@ mkdir -p "${BASE_SCRATCH_DIR}" mkdir -p "${CCACHE_DIR}" export ASAN_OPTIONS="" -export LSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/lsan" -export TSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/tsan" -export UBSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1" +export LSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/lsan" +export TSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/tsan" +export UBSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1" env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env if [[ $HOST = *-mingw32 ]]; then DOCKER_ADMIN="--cap-add SYS_ADMIN"