aboutsummaryrefslogtreecommitdiff
path: root/ci/test
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-11-08 09:48:29 +0100
committerMarcoFalke <falke.marco@gmail.com>2020-11-09 10:15:59 +0100
commit3333d6942e8c5d823b97ea51ef88c8a0791742c6 (patch)
treeeffe6abba24742f634920917f670b5804b1cabaa /ci/test
parentfa8b1114e60100f503673ccc7ef5618851c0c9e3 (diff)
ci: Run macos ci config on cirrus
Diffstat (limited to 'ci/test')
-rw-r--r--ci/test/00_setup_env_mac_host.sh4
-rwxr-xr-xci/test/04_install.sh2
2 files changed, 1 insertions, 5 deletions
diff --git a/ci/test/00_setup_env_mac_host.sh b/ci/test/00_setup_env_mac_host.sh
index a2e3af887c..7c25a34cfe 100644
--- a/ci/test/00_setup_env_mac_host.sh
+++ b/ci/test/00_setup_env_mac_host.sh
@@ -16,7 +16,3 @@ export OSX_SDK=""
export CCACHE_SIZE=300M
export RUN_SECURITY_TESTS="true"
-if [ "$TRAVIS_REPO_SLUG" != "bitcoin/bitcoin" ]; then
- export RUN_FUNCTIONAL_TESTS="false"
- export EXPECTED_TESTS_DURATION_IN_SECONDS=200
-fi
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index b0f802186d..ea3e7bcd4e 100755
--- a/ci/test/04_install.sh
+++ b/ci/test/04_install.sh
@@ -14,7 +14,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
fi
if [ "$CI_OS_NAME" == "macos" ]; then
- ${CI_RETRY_EXE} pip3 install $PIP_PACKAGES
+ IN_GETOPT_BIN="/usr/local/opt/gnu-getopt/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
fi
# Create folders that are mounted into the docker