diff options
| author | fanquake <fanquake@gmail.com> | 2020-06-29 14:26:23 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-06-29 14:35:20 +0800 |
| commit | 19612ca2eb2e335c8ccc9c0f33421df22f1cc3b6 (patch) | |
| tree | 23806ac3d3bdce2d3aa8a378a7ec6b8fe2c2b0fd /ci/test/00_setup_env_native_tsan.sh | |
| parent | b80ae6b4c04b2b9f8a4181acf450bcd513f27788 (diff) | |
| parent | fa74a54fad7abfe3b0c98c5a6e4780d63d35b13f (diff) | |
| download | bitcoin-19612ca2eb2e335c8ccc9c0f33421df22f1cc3b6.tar.xz | |
Merge #19371: ci: Increase test timeout for sanitizer configs
fa74a54fad7abfe3b0c98c5a6e4780d63d35b13f ci: Increase test timeout for sanitizer configs (MarcoFalke)
Pull request description:
Hopefully fixes #19369
ACKs for top commit:
practicalswift:
ACK fa74a54fad7abfe3b0c98c5a6e4780d63d35b13f -- patch looks correct!
fanquake:
ACK fa74a54fad7abfe3b0c98c5a6e4780d63d35b13f - the test failure here is a different issue, and the problem referenced by this PR hasn't occurred, so I think this can be merged. It's also fixing the use of `--factor` which was replaced in #18986.
Tree-SHA512: bec44fff454f20b7c5f8a461560d2496765dea61186027cc0cdce5ac55be0488b6f7f172fec49b89fe59a75b455501e2b4ae91a98c4a17d5c1a722846d2b3b60
Diffstat (limited to 'ci/test/00_setup_env_native_tsan.sh')
| -rw-r--r-- | ci/test/00_setup_env_native_tsan.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index 87b9d9da95..ada7a65b8f 100644 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -10,5 +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 GOAL="install" export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'" |