Skip to content

Commit

Permalink
Merge #11311: travis: Revert default datadir check
Browse files Browse the repository at this point in the history
fa4fad9 travis: Revert default datadir check (MarcoFalke)

Pull request description:

  This still breaks builds. The default datadir check needs more work to stay in master.

Tree-SHA512: b930df4ff8cb76089030aedb2ebbbc1ecc26f9e3d1aba29c78f9f03d7611c6ecaa27afb15ee643690643439d78b98aef9c0c5b2657c7f2fe0c28a3076d6913c2
  • Loading branch information
MarcoFalke committed Sep 12, 2017
2 parents 801dd40 + fa4fad9 commit cce94c5
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Expand Up @@ -49,7 +49,6 @@ before_script:
- 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
- rm -rf ~/.bitcoin
- 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
Expand All @@ -76,7 +75,6 @@ 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

0 comments on commit cce94c5

Please sign in to comment.