Skip to content

Commit 069752b

Browse files
build: Enable functional tests in the ThreadSanitizer (TSan) build job
1 parent 9133227 commit 069752b

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ jobs:
9999
DOCKER_NAME_TAG=ubuntu:16.04
100100
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"
101101
NO_DEPENDS=1
102-
RUN_FUNCTIONAL_TESTS=false # Disabled for now. TODO identify suppressions or exclude specific tests
102+
FUNCTIONAL_TESTS_CONFIG="--exclude feature_block.py,p2p_invalid_messages.py"
103103
GOAL="install"
104-
BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=thread --disable-hardening --disable-asm CC=clang CXX=clang++"
104+
BITCOIN_CONFIG="--enable-zmq --disable-wallet --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=thread --disable-hardening --disable-asm CC=clang CXX=clang++"
105105
# x86_64 Linux (no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer)
106106
- stage: test
107107
env: >-

.travis/test_04_install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
export LC_ALL=C.UTF-8
88

99
travis_retry docker pull "$DOCKER_NAME_TAG"
10+
mkdir -p "${TRAVIS_BUILD_DIR}/sanitizer-output/"
1011
export ASAN_OPTIONS=""
1112
export LSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/lsan"
12-
export TSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/tsan"
13+
export TSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/tsan:log_path=${TRAVIS_BUILD_DIR}/sanitizer-output/tsan"
1314
export UBSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1"
1415
env | grep -E '^(BITCOIN_CONFIG|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env
1516
if [[ $HOST = *-mingw32 ]]; then

.travis/test_06_script.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,19 @@ DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOI
4141
END_FOLD
4242

4343
BEGIN_FOLD build
44-
DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false )
44+
DOCKER_EXEC make $MAKEJOBS $GOAL || (
45+
echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1
46+
DOCKER_EXEC "cat ${TRAVIS_BUILD_DIR}/sanitizer-output/* 2> /dev/null"
47+
false
48+
)
4549
END_FOLD
4650

4751
if [ "$RUN_UNIT_TESTS" = "true" ]; then
4852
BEGIN_FOLD unit-tests
49-
DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1
53+
DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1 || (
54+
DOCKER_EXEC "cat ${TRAVIS_BUILD_DIR}/sanitizer-output/* 2> /dev/null"
55+
false
56+
)
5057
END_FOLD
5158
fi
5259

@@ -56,6 +63,9 @@ fi
5663

5764
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
5865
BEGIN_FOLD functional-tests
59-
DOCKER_EXEC test/functional/test_runner.py --ci --combinedlogslen=4000 --coverage --quiet --failfast ${extended} ${FUNCTIONAL_TESTS_CONFIG}
66+
DOCKER_EXEC test/functional/test_runner.py --ci --combinedlogslen=4000 --coverage --quiet --failfast ${extended} ${FUNCTIONAL_TESTS_CONFIG} || (
67+
DOCKER_EXEC "cat ${TRAVIS_BUILD_DIR}/sanitizer-output/* 2> /dev/null"
68+
false
69+
)
6070
END_FOLD
6171
fi

test/sanitizer_suppressions/tsan

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ deadlock:TestPotentialDeadLockDetected
1111
race:src/qt/test/*
1212
deadlock:src/qt/test/*
1313

14-
# WIP: Unidentified suppressions to run the functional tests
15-
#race:zmqpublishnotifier.cpp
16-
#
17-
#deadlock:CreateWalletFromFile
18-
#deadlock:importprivkey
19-
#deadlock:walletdb.h
20-
#deadlock:walletdb.cpp
21-
#deadlock:wallet/db.cpp
14+
# External libraries
15+
deadlock:libdb
16+
race:libzmq

0 commit comments

Comments
 (0)