aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-11-04 13:54:05 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-11-04 14:10:07 -0500
commitfa56bcbb010467fc26c8c50e077d050abaeda9b8 (patch)
treeb2a0fdc1513721bee42f0b865797400ae499dd22
parent94a26b192f187cb50bf1ac1775b23f2b03f772b1 (diff)
ci: Run CI_WAIT only on travis
-rw-r--r--.travis.yml1
-rwxr-xr-xci/test/06_script_b.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 51bb7d6e0b..f6f3c1eff5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,7 @@ stages:
env:
global:
- CI_RETRY_EXE="travis_retry"
+ - CI_WAIT="while sleep 500; do echo .; done"
- CACHE_ERR_MSG="Error! Initial build successful, but not enough time remains to run later build stages and tests. Please manually re-run this job by using the travis restart button or asking a bitcoin maintainer to restart. The next run should not time out because the build cache has been saved."
before_install:
- set -o errexit; source ./ci/test/00_setup_env.sh
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh
index 048fe06c84..7ac4907d32 100755
--- a/ci/test/06_script_b.sh
+++ b/ci/test/06_script_b.sh
@@ -32,7 +32,7 @@ fi
if [ "$RUN_UNIT_TESTS" = "true" ]; then
BEGIN_FOLD unit-tests
- bash -c "while sleep 500; do echo .; done" & # Print dots in case the unit tests take a long time to run
+ bash -c "${CI_WAIT}" & # Print dots in case the unit tests take a long time to run
DOCKER_EXEC LD_LIBRARY_PATH=$BASE_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1
END_FOLD
fi