test: move TEST_RUNNER_EXTRA into native tsan setup
This commit is contained in:
parent
1269cab21a
commit
a92e48b02d
2 changed files with 1 additions and 3 deletions
|
@ -101,9 +101,7 @@ jobs:
|
||||||
|
|
||||||
- stage: test
|
- stage: test
|
||||||
name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]'
|
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: >-
|
env: >-
|
||||||
TEST_RUNNER_EXTRA="--exclude feature_block"
|
|
||||||
FILE_ENV="./ci/test/00_setup_env_native_tsan.sh"
|
FILE_ENV="./ci/test/00_setup_env_native_tsan.sh"
|
||||||
|
|
||||||
- stage: test
|
- stage: test
|
||||||
|
|
|
@ -10,6 +10,6 @@ export CONTAINER_NAME=ci_native_tsan
|
||||||
export DOCKER_NAME_TAG=ubuntu:20.04
|
export DOCKER_NAME_TAG=ubuntu:20.04
|
||||||
export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
|
export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
|
||||||
export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'"
|
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 GOAL="install"
|
||||||
export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'"
|
export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'"
|
||||||
|
|
Loading…
Reference in a new issue