diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-02-01 17:17:36 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-01 17:18:03 -0500 |
| commit | b3a715301a0fd972fb2f3bd36e2680b3cdbbab26 (patch) | |
| tree | f9f233e70c227d5136e9fd6a7fbc25aef9b316bf /.travis | |
| parent | 2c0867a1811bd7120aa66d98723ae96b065a3c1b (diff) | |
| parent | facaae4cc4b3a44fb0332a40865eed8f2bbd6864 (diff) | |
| download | bitcoin-b3a715301a0fd972fb2f3bd36e2680b3cdbbab26.tar.xz | |
Merge #15303: travis: Remove unused FUNCTIONAL_TESTS_CONFIG
facaae4cc4 travis: Save cache when compilation took very long (MarcoFalke)
faee6c9cac travis: Remove unused FUNCTIONAL_TESTS_CONFIG (MarcoFalke)
Pull request description:
Closes #14163
Tree-SHA512: fb3dd0b7a0a3ee7ac1c6d4e9314239cd03ab4a11f04b6345ef4a1f50ea2b79ea4248c41e99a6fb923a4b1b477758c4fa665d56a4ab703acf5a58dbc7d852ffc4
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/test_06_script_a.sh (renamed from .travis/test_06_script.sh) | 16 | ||||
| -rwxr-xr-x | .travis/test_06_script_b.sh | 25 |
2 files changed, 26 insertions, 15 deletions
diff --git a/.travis/test_06_script.sh b/.travis/test_06_script_a.sh index 618aa2c3b6..8cc593f936 100755 --- a/.travis/test_06_script.sh +++ b/.travis/test_06_script_a.sh @@ -47,18 +47,4 @@ 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_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 -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} ${FUNCTIONAL_TESTS_CONFIG} - END_FOLD -fi +cd ${TRAVIS_BUILD_DIR} || (echo "could not enter travis build dir $TRAVIS_BUILD_DIR"; exit 1) diff --git a/.travis/test_06_script_b.sh b/.travis/test_06_script_b.sh new file mode 100755 index 0000000000..472448a658 --- /dev/null +++ b/.travis/test_06_script_b.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2018 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +export LC_ALL=C.UTF-8 + +cd "build/bitcoin-$HOST" || (echo "could not enter distdir build/bitcoin-$HOST"; exit 1) + +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 +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} + END_FOLD +fi |