diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-08-27 10:23:49 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-08-27 10:23:51 -0400 |
| commit | 794e55be104ccbfbf92569fa7572d2d4b0b4ad7c (patch) | |
| tree | 03b58a781e191a54901ed0758b0b96aa164f0c78 | |
| parent | ca4510c15da2f42a1769b9cab0e26d3f855a93b3 (diff) | |
| parent | c55c5f2b17414e2852e858e036ed23e8d65a383a (diff) | |
| download | bitcoin-794e55be104ccbfbf92569fa7572d2d4b0b4ad7c.tar.xz | |
Merge #14081: travis: fix missing differentiation between UNIT and FUNCTIONAL tests
c55c5f2b17 fix missing differentiation between UNIT and FUNCTIONAL tests in travis build (Julian Fleischer)
Pull request description:
@MarcoFalke follow up to https://github.com/bitcoin/bitcoin/pull/13863
I must have missed the separation of `RUN_FUNCTIONAL_TESTS` and `RUN_UNIT_TESTS` when doing the rebase. Fixed the two places you mentioned accordingly.
Tree-SHA512: 43d14cb16fe72f77c5a142509fb59849e32b58a12565a752e8b4e36282eb74f796b97140d9a64e1ba0d0409d07107f77fd84aaddf87617470f19ff0dd332dd58
| -rwxr-xr-x | .travis/test_06_script.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis/test_06_script.sh b/.travis/test_06_script.sh index dd4633039c..e5fea81187 100755 --- a/.travis/test_06_script.sh +++ b/.travis/test_06_script.sh @@ -44,7 +44,7 @@ BEGIN_FOLD build DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ) END_FOLD -if [ "$RUN_TESTS" = "true" ]; then +if [ "$RUN_UNIT_TESTS" = "true" ]; then BEGIN_FOLD unit-tests DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1 END_FOLD @@ -60,7 +60,7 @@ if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash" fi -if [ "$RUN_TESTS" = "true" ]; then +if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then BEGIN_FOLD functional-tests DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended} END_FOLD |