diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-02-25 12:30:05 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-02-27 08:03:15 -0500 |
| commit | 157fe938eabf6428fa9de42d57f8cfad08b38ddb (patch) | |
| tree | f3f293b70e1d85e1d5f5c5763524b632f9bd8694 | |
| parent | 7d8f7d969c6e552738260418a504724ac9ffa7c7 (diff) | |
| download | haskell-157fe938eabf6428fa9de42d57f8cfad08b38ddb.tar.gz | |
gitlab-ci: Fix TEST_ARGS/RUNTEST_ARGS inconsistency
Finally fixes #19025.
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a7bfb7447..77ba17b8c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -492,7 +492,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 @@ -519,7 +519,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: |