[Git][ghc/ghc][wip/freebsd] 2 commits: testsuite: Skip T16992 unless in slow speed

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/freebsd at Glasgow Haskell Compiler / GHC


Commits:
838bca2c by Ben Gamari at 2024-12-06T18:05:12-05:00
testsuite: Skip T16992 unless in slow speed

This test has extraordinary memory requirements and tests a rather
niche aspect of the compact region mechanism. It has been suggested
multiple times that we shouldn't run it in the default testsuite
configuration. Finally implement this.

See #21890.
See #21892.

- - - - -
0bc18c68 by Ben Gamari at 2024-12-06T18:05:12-05:00
gitlab/ci: Don't clobber RUNTEST_ARGS

Previously the logic handling `IGNORE_PERF_FAILURES` clobbered the
user's `RUNTEST_ARGS`. Fix this.

- - - - -


3 changed files:

- .gitlab/ci.sh
- libraries/ghc-compact/tests/all.T
- testsuite/driver/testlib.py


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -960,7 +960,7 @@ if [ "${CI_COMMIT_BRANCH:-}" == "master" ] &&  [ "${CI_PROJECT_PATH:-}" == "ghc/
   fi
 fi
 if [ -n "${IGNORE_PERF_FAILURES:-}" ]; then
-  RUNTEST_ARGS="--ignore-perf-failures=$IGNORE_PERF_FAILURES"
+  RUNTEST_ARGS=( $RUNTEST_ARGS "--ignore-perf-failures=$IGNORE_PERF_FAILURES" )
 fi
 
 if [[ -z ${BIGNUM_BACKEND:-} ]]; then BIGNUM_BACKEND=gmp; fi


=====================================
libraries/ghc-compact/tests/all.T
=====================================
@@ -28,5 +28,8 @@ test('T18757', omit_ghci, compile_and_run, [''])
 # N.B. Sanity check times out due to large list.
 test('T16992', [when(wordsize(32), skip), # Resource limit exceeded on 32-bit
                 high_memory_usage,
+                # This test has extraordinary memory requirement,
+                # skip unless testing slow speed
+                unless(slow(), skip),
                 run_timeout_multiplier(5),
                 omit_ways(['sanity'])], compile_and_run, [''])


=====================================
testsuite/driver/testlib.py
=====================================
@@ -970,6 +970,9 @@ def tables_next_to_code() -> bool:
 def fast() -> bool:
     return config.speed == 2
 
+def slow() -> bool:
+    return config.speed == 0
+
 def platform( plat: str ) -> bool:
     return config.platform == plat
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8b86203c1ba732abfe4074d448ce5d9dce66891b...0bc18c689102eb7b826be072ff14f3f99e2f2b1b

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8b86203c1ba732abfe4074d448ce5d9dce66891b...0bc18c689102eb7b826be072ff14f3f99e2f2b1b
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241206/2d5a2413/attachment-0001.html>