Skip to content

Commit 794e55b

Browse files
author
MarcoFalke
committed
Merge #14081: travis: fix missing differentiation between UNIT and FUNCTIONAL tests
c55c5f2 fix missing differentiation between UNIT and FUNCTIONAL tests in travis build (Julian Fleischer) Pull request description: @MarcoFalke follow up to bitcoin/bitcoin#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
2 parents ca4510c + c55c5f2 commit 794e55b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.travis/test_06_script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ BEGIN_FOLD build
4444
DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false )
4545
END_FOLD
4646

47-
if [ "$RUN_TESTS" = "true" ]; then
47+
if [ "$RUN_UNIT_TESTS" = "true" ]; then
4848
BEGIN_FOLD unit-tests
4949
DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1
5050
END_FOLD
@@ -60,7 +60,7 @@ if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
6060
extended="--extended --exclude feature_pruning,feature_dbcrash"
6161
fi
6262

63-
if [ "$RUN_TESTS" = "true" ]; then
63+
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
6464
BEGIN_FOLD functional-tests
6565
DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}
6666
END_FOLD

0 commit comments

Comments
 (0)