From 1ba08c99f91f274012490cc92b70bd8862c0089e Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 25 Feb 2021 12:30:05 -0500 Subject: gitlab-ci: Fix TEST_ARGS/RUNTEST_ARGS inconsistency Finally fixes #19025. --- .gitlab-ci.yml | 4 ++-- .gitlab/ci.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86c140ab76..7f415ca00a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -471,7 +471,7 @@ validate-x86_64-darwin: TEST_ENV: "x86_64-darwin" BUILD_FLAVOUR: "validate" # Due to #19025 - TEST_ARGS: "--ignore-perf-failures" + RUNTEST_ARGS: "--ignore-perf-failures" after_script: - cp -Rf $HOME/.cabal cabal-cache - .gitlab/ci.sh clean @@ -498,7 +498,7 @@ validate-x86_64-darwin: CONFIGURE_ARGS: --with-intree-gmp TEST_ENV: "x86_64-darwin-hadrian" # Due to #19025 - TEST_ARGS: "--ignore-perf-failures" + RUNTEST_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 9dca90bbaa..c6dd28e00b 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -44,7 +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 + RUNTEST_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: -- cgit v1.2.1