Skip to content

Commit 52f8877

Browse files
author
MarcoFalke
committed
Merge #11260: travis: Assert default datadir isn't created, Run scripted diff only once
fa40b0e travis: Assert default datadir isn't created, Run scripted diff only once (MarcoFalke) Pull request description: It is sufficient to check the scripted diffs on one arch, i.e. `CHECK_DOC`==1. Also, the default datadir should not be created by just running the tests. Tree-SHA512: d55e77cf0a888287f5d070ae368b24e7183863374420a7b8a2f9a69e3dc0a27dd5366b81d90646c2aa2c40e052d1bc7bf88644c19e153cc411d483d2ce95c973
2 parents e6ab88a + fa40b0e commit 52f8877

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ install:
4343
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
4444
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi
4545
before_script:
46-
- if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi
47-
- unset CC; unset CXX
46+
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi
4847
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi
48+
- unset CC; unset CXX
4949
- mkdir -p depends/SDKs depends/sdk-sources
5050
- if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
5151
- if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
@@ -70,6 +70,7 @@ script:
7070
- if [ "$RUN_TESTS" = "true" ]; then travis_wait 30 make $MAKEJOBS check VERBOSE=1; fi
7171
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude pruning,dbcrash"; fi
7272
- if [ "$RUN_TESTS" = "true" ]; then test/functional/test_runner.py --coverage --quiet ${extended}; fi
73+
- if [ -d ~/.bitcoin ]; then false; fi # Make sure default datadir does not exist after tests
7374
after_script:
7475
- echo $TRAVIS_COMMIT_RANGE
7576
- echo $TRAVIS_COMMIT_LOG

0 commit comments

Comments
 (0)