aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-02-04 11:14:05 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-02-04 11:14:07 -0500
commit70d06eb857ceedb538e689fa948a3ea3899dfc3c (patch)
tree5abd89ecf023f48d94c0961d992ac6972e6a1058
parent6a5feb7d821f1d5a3c0c1fc808ab8707f581ea76 (diff)
parentfa6b7b9cf66344dfb638fd645c44c22521088165 (diff)
Merge #15328: travis: Revert "Run extended tests once daily"
fa6b7b9cf6 travis: Revert "Run extended tests once daily" (MarcoFalke) Pull request description: Now that the extended tests are only pruning and dbcrash, both which are too long [1] to run on travis, we can revert this commit. All tests other than those two are still run for every travis pull request or cron run. [1] https://travis-ci.org/bitcoin/bitcoin/jobs/487615211#L2930 Tree-SHA512: dff293823336677380f6e804379125687869a4b547c968f0b6aae80daee1cbca2cfb845b63de7135f31fbe2383d8d7654694b6dc8a6a6b7d02d57ee8ff107527
-rwxr-xr-x.travis/test_06_script_b.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/.travis/test_06_script_b.sh b/.travis/test_06_script_b.sh
index 472448a658..b6b5925be8 100755
--- a/.travis/test_06_script_b.sh
+++ b/.travis/test_06_script_b.sh
@@ -14,12 +14,8 @@ if [ "$RUN_UNIT_TESTS" = "true" ]; then
END_FOLD
fi
-if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
- extended="--extended --exclude feature_pruning"
-fi
-
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
BEGIN_FOLD functional-tests
- DOCKER_EXEC test/functional/test_runner.py --ci --combinedlogslen=4000 --coverage --quiet --failfast ${extended}
+ DOCKER_EXEC test/functional/test_runner.py --ci --combinedlogslen=4000 --coverage --quiet --failfast
END_FOLD
fi