diff options
| author | fanquake <fanquake@gmail.com> | 2020-06-29 22:00:27 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-06-29 22:00:27 +0800 |
| commit | a92e48b02df545e620a7b1de74f647f46413d3fb (patch) | |
| tree | b93e7e57c3a76ad57baed7e2f68e2a99ff963229 | |
| parent | 1269cab21a9ac32f9ee8adfb9041950756eff3e4 (diff) | |
| download | bitcoin-a92e48b02df545e620a7b1de74f647f46413d3fb.tar.xz | |
test: move TEST_RUNNER_EXTRA into native tsan setup
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | ci/test/00_setup_env_native_tsan.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index edec60afba..108a4c968d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,9 +101,7 @@ jobs: - stage: test name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]' - # Not enough memory on travis machines, so feature_block is excluded for now env: >- - TEST_RUNNER_EXTRA="--exclude feature_block" FILE_ENV="./ci/test/00_setup_env_native_tsan.sh" - stage: test diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index ada7a65b8f..c4fe0eff2f 100644 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -10,6 +10,6 @@ export CONTAINER_NAME=ci_native_tsan export DOCKER_NAME_TAG=ubuntu:20.04 export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq" export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'" -export TEST_RUNNER_EXTRA="--timeout-factor=4" # Increase timeout because sanitizers slow down +export TEST_RUNNER_EXTRA="--exclude feature_block --timeout-factor=4" # Increase timeout because sanitizers slow down. Low memory on Travis machines, exclude feature_block. export GOAL="install" export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'" |