summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-02-24 09:08:02 -0500
committerBen Gamari <ben@smart-cactus.org>2021-02-24 11:15:41 -0500
commit10e115d39d6062151cc95256fee052b197a46186 (patch)
tree5974ef164540dbe5f3a269de75978b557bbb7e10 /.gitlab
parent559e4b2b33ee33c3f30ded3cb9856324ecb49382 (diff)
downloadhaskell-10e115d39d6062151cc95256fee052b197a46186.tar.gz
gitlab-ci: Ignore performance test failures on Darwin
Due to #19025.
Diffstat (limited to '.gitlab')
-rwxr-xr-x.gitlab/ci.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 2d038cf726..9dca90bbaa 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -44,6 +44,7 @@ Environment variables affecting both build systems:
CROSS_TARGET Triple of cross-compilation target.
VERBOSE Set to non-empty for verbose build output
+ TEST_ARGS Arguments passed to runtest.py
MSYSTEM (Windows-only) Which platform to build form (MINGW64 or MINGW32).
Environment variables determining build configuration of Make system:
@@ -443,7 +444,8 @@ function test_make() {
run "$MAKE" test_bindist TEST_PREP=YES
run "$MAKE" V=0 test \
THREADS="$cores" \
- JUNIT_FILE=../../junit.xml
+ JUNIT_FILE=../../junit.xml \
+ EXTRA_RUNTEST_OPTS="$RUNTEST_ARGS"
}
function build_hadrian() {
@@ -470,7 +472,8 @@ function test_hadrian() {
run_hadrian \
test \
--summary-junit=./junit.xml \
- --test-compiler="$TOP"/_build/install/bin/ghc
+ --test-compiler="$TOP"/_build/install/bin/ghc \
+ "runtest.opts+=$RUNTEST_ARGS"
}
function cabal_test() {