Skip to content

Commit a1fd876

Browse files
author
MarcoFalke
committed
Merge #15022: tests: Upgrade Travis OS to Xenial
b6f0db6 Increase timeout of featuer_assumevalid test to fix flaky tests (Graham Krizek) aa9aca8 If tests are ran with (ASan + LSan), Docker needs access to ptrace (Graham Krizek) a3b8b43 Update Travis base OS to Xenial (Graham Krizek) Pull request description: Update base Travis OS to `xenial` from `trusty`. Link to Travis Docs for Xenial: https://docs.travis-ci.com/user/reference/xenial/ As noted in the documentation, Docker version is also updated from `17.06` to `18.06` Also includes: - If running Bitcoin config with LSan sanitizer, Allow ptrace in Docker run command - Increase timeout of feature_assumevalid test to fix flaky tests Tree-SHA512: baf2eda0cbb9990c43c76de1aebc8dd4a3f540323ac1fe2e164ac3bcf1fe3afa3e5b026bfeb5d650dae09a6854695d5744c1130c2fa82ece86c6835ba152f68d
2 parents cbb91cd + b6f0db6 commit a1fd876

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dist: trusty
1+
dist: xenial
22
os: linux
33
language: minimal
44
cache:

.travis/test_04_install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ export UBSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressio
1515
env | grep -E '^(BITCOIN_CONFIG|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env
1616
if [[ $HOST = *-mingw32 ]]; then
1717
DOCKER_ADMIN="--cap-add SYS_ADMIN"
18+
elif [[ $BITCOIN_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (ASan + LSan), Docker needs access to ptrace (https://github.com/google/sanitizers/issues/764)
19+
DOCKER_ADMIN="--cap-add SYS_PTRACE"
1820
fi
1921
DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG)
2022

test/functional/feature_assumevalid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def run_test(self):
180180
for i in range(2202):
181181
p2p1.send_message(msg_block(self.blocks[i]))
182182
# Syncing 2200 blocks can take a while on slow systems. Give it plenty of time to sync.
183-
p2p1.sync_with_ping(120)
183+
p2p1.sync_with_ping(150)
184184
assert_equal(self.nodes[1].getblock(self.nodes[1].getbestblockhash())['height'], 2202)
185185

186186
# Send blocks to node2. Block 102 will be rejected.

0 commit comments

Comments
 (0)