diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-09-07 13:07:42 -0700 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-09-07 13:07:51 -0700 |
| commit | 52f8877525d5238f3440e73710507be889d14127 (patch) | |
| tree | 9d306d2f3cd7f9c24c52d90a099f8c5a34a59793 | |
| parent | e6ab88a4524a6dce40b985655a03a3607d4f38b7 (diff) | |
| parent | fa40b0eb514e77928a13a007df170e5ede18ee3e (diff) | |
Merge #11260: travis: Assert default datadir isn't created, Run scripted diff only once
fa40b0eb5 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
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index dadac3165e..061683ac6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,9 +43,9 @@ install: - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi before_script: - - if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi - - unset CC; unset CXX + - if [ "$CHECK_DOC" = 1 -a "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi - if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi + - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources - 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 - 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: - if [ "$RUN_TESTS" = "true" ]; then travis_wait 30 make $MAKEJOBS check VERBOSE=1; fi - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude pruning,dbcrash"; fi - if [ "$RUN_TESTS" = "true" ]; then test/functional/test_runner.py --coverage --quiet ${extended}; fi + - if [ -d ~/.bitcoin ]; then false; fi # Make sure default datadir does not exist after tests after_script: - echo $TRAVIS_COMMIT_RANGE - echo $TRAVIS_COMMIT_LOG |