diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2321258808..86c140ab76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -470,6 +470,8 @@ validate-x86_64-darwin: CONFIGURE_ARGS: "--with-intree-gmp" TEST_ENV: "x86_64-darwin" BUILD_FLAVOUR: "validate" + # Due to #19025 + TEST_ARGS: "--ignore-perf-failures" after_script: - cp -Rf $HOME/.cabal cabal-cache - .gitlab/ci.sh clean @@ -495,6 +497,8 @@ validate-x86_64-darwin: LANG: "en_US.UTF-8" CONFIGURE_ARGS: --with-intree-gmp TEST_ENV: "x86_64-darwin-hadrian" + # Due to #19025 + TEST_ARGS: "--ignore-perf-failures" BIN_DIST_NAME: "ghc-x86_64-apple-darwin" BUILD_FLAVOUR: "validate" script: 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() { |