diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-11-23 09:38:08 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-11-23 09:38:33 -0500 |
commit | 2607c38fc5170409dd13f3061ba5e5fa2de6438d (patch) | |
tree | 429236192bbcfe064d6f815faea23c63829a3b7c | |
parent | 59f05d1161698dcca6eaf719422d4ec3401f2954 (diff) | |
parent | fa7d36b8e77cafe74ac9c11ebe752b731c215480 (diff) | |
download | bitcoin-2607c38fc5170409dd13f3061ba5e5fa2de6438d.tar.xz |
Merge #14764: travis: Run thread sanitizer on unit tests
fa7d36b8e7 test: Move UBSAN suppressions to test/sanitizer_suppressions/ubsan (MarcoFalke)
fa36d4e456 travis: --disable-hardening for xenial thread sanitizer (MarcoFalke)
89bf196c88 travis: Run thread sanitizer (MarcoFalke)
Pull request description:
On unit tests only for now. Disabled for the gui unit tests and all functional tests.
Tree-SHA512: 56f7d3b44e7cb68c76a2dc5abd85658955b1c2188932e988667c5a1cbcdd6be995d37bb949d62c6eb08a4aebfc43ff0370b7da1719d4e4f322a3495c1941a5e0
-rw-r--r-- | .travis.yml | 9 | ||||
-rwxr-xr-x | .travis/test_04_install.sh | 5 | ||||
-rw-r--r-- | test/sanitizer_suppressions/tsan | 24 | ||||
-rw-r--r-- | test/sanitizer_suppressions/ubsan (renamed from contrib/sanitizers-ubsan.suppressions) | 0 |
4 files changed, 32 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 6cecbb224f..cd691e49cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,15 +92,16 @@ jobs: DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" GOAL="install" BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-debug CXXFLAGS=\"-g0 -O2\"" -# x86_64 Linux (xenial, no depends, only system libs) +# x86_64 Linux (xenial, no depends, only system libs, sanitizers: thread (TSAN)) - stage: test env: >- HOST=x86_64-unknown-linux-gnu DOCKER_NAME_TAG=ubuntu:16.04 - PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev" + PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev" NO_DEPENDS=1 + RUN_FUNCTIONAL_TESTS=false # Disabled for now. TODO identify suppressions or exclude specific tests GOAL="install" - BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER" + BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=thread --disable-hardening --disable-asm CC=clang CXX=clang++" # x86_64 Linux (no depends, only system libs, sanitizers: undefined (UBSAN) + integer) - stage: test env: >- @@ -108,7 +109,7 @@ jobs: PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev" NO_DEPENDS=1 GOAL="install" - BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=integer,undefined CC=clang CXX=clang++" + BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=integer,undefined CC=clang CXX=clang++" # x86_64 Linux, No wallet - stage: test env: >- diff --git a/.travis/test_04_install.sh b/.travis/test_04_install.sh index 4cf0ba8984..75de71c583 100755 --- a/.travis/test_04_install.sh +++ b/.travis/test_04_install.sh @@ -7,8 +7,9 @@ export LC_ALL=C.UTF-8 travis_retry docker pull "$DOCKER_NAME_TAG" -export UBSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/contrib/sanitizers-ubsan.suppressions:print_stacktrace=1:halt_on_error=1" -env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|UBSAN_OPTIONS)' | tee /tmp/env +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" +env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(TSAN|UBSAN)_OPTIONS)' | tee /tmp/env if [[ $HOST = *-mingw32 ]]; then DOCKER_ADMIN="--cap-add SYS_ADMIN" fi diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan new file mode 100644 index 0000000000..209c46f096 --- /dev/null +++ b/test/sanitizer_suppressions/tsan @@ -0,0 +1,24 @@ +# ThreadSanitizer suppressions +# ============================ + +# fChecked is theoretically racy, practically only in unit tests +race:CheckBlock + +# WalletBatch (unidentified deadlock) +deadlock:WalletBatch + +# Intentional deadlock in tests +deadlock:TestPotentialDeadLockDetected + +# Wildcard for all gui tests, should be replaced with non-wildcard suppressions +race:src/qt/test/* +deadlock:src/qt/test/* + +# WIP: Unidentified suppressions to run the functional tests +#race:zmqpublishnotifier.cpp +# +#deadlock:CreateWalletFromFile +#deadlock:importprivkey +#deadlock:walletdb.h +#deadlock:walletdb.cpp +#deadlock:wallet/db.cpp diff --git a/contrib/sanitizers-ubsan.suppressions b/test/sanitizer_suppressions/ubsan index e90d5c2ac0..e90d5c2ac0 100644 --- a/contrib/sanitizers-ubsan.suppressions +++ b/test/sanitizer_suppressions/ubsan |