aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@protonmail.com>2019-10-24 20:26:49 +0200
committerWladimir J. van der Laan <laanwj@protonmail.com>2019-10-24 20:27:08 +0200
commit4af04471695297e59fb0c855ab8fe6f6c618f8f2 (patch)
tree9cd7cece0c1b6433de0a6b760c0be33b2c87987c
parentd7134ead84e3b824688f0ba195d5dc461a0491e6 (diff)
parentfa710066b9c992ccde7149cfa8da923bcc08bc22 (diff)
Merge #17240: ci: Disable functional tests on mac host
fa710066b9c992ccde7149cfa8da923bcc08bc22 ci: Disable functional tests on mac host (MarcoFalke) Pull request description: Judging from the lack of responses to https://github.com/bitcoin/bitcoin/issues/15400#issuecomment-543745053, no one can reproduce the failures locally. Thus, disable the tests on the ci mac host. Otherwise they cause ci failures to be ignored or overwritten by a blind re-run. ACKs for top commit: laanwj: ok, ACK fa710066b9c992ccde7149cfa8da923bcc08bc22 in that case ryanofsky: Code review ACK fa710066b9c992ccde7149cfa8da923bcc08bc22. I've been blindly restarting these but can confirm it seemed like random test failures. Tree-SHA512: 805f552124409f6e79b16b419826d334307202b8e3636edc8a91dadffe9949554d924c00cb16bb09473ec1aaaf2d8eaf7a97c7c2b8c11bf6372135d39bba802b
-rw-r--r--.travis.yml2
-rw-r--r--ci/test/00_setup_env_mac_host.sh (renamed from ci/test/00_setup_env_mac_functional.sh)2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 0a14ddf34c..60d0481d62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -152,4 +152,4 @@ jobs:
# https://docs.travis-ci.com/user/reference/osx/#macos-version
osx_image: xcode11
env: >-
- FILE_ENV="./ci/test/00_setup_env_mac_functional.sh"
+ FILE_ENV="./ci/test/00_setup_env_mac_host.sh"
diff --git a/ci/test/00_setup_env_mac_functional.sh b/ci/test/00_setup_env_mac_host.sh
index e9e68c47a8..3033f4cdd9 100644
--- a/ci/test/00_setup_env_mac_functional.sh
+++ b/ci/test/00_setup_env_mac_host.sh
@@ -11,7 +11,7 @@ export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config p
export PIP_PACKAGES="zmq"
export RUN_CI_ON_HOST=true
export RUN_UNIT_TESTS=true
-export RUN_FUNCTIONAL_TESTS=true
+export RUN_FUNCTIONAL_TESTS=false
export GOAL="install"
export BITCOIN_CONFIG="--enable-gui --enable-bip70 --enable-reduce-exports --enable-werror"
# Run without depends