summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Steuck <greg@nest.cx>2022-01-08 21:01:13 -0800
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-01-11 19:45:11 -0500
commite505dbd36f3c8c43a645a176babefabfd0a72eeb (patch)
treed426a7914a9d974f76c9b2a3a4713a6d605a3e8b
parent7ca43a3fb315abf172a6f7ff2bb4cf4303017e24 (diff)
downloadhaskell-e505dbd36f3c8c43a645a176babefabfd0a72eeb.tar.gz
Remove from error the parenthesized amount of memory requested
Diagnostics for outofmem test on OpenBSD includes the amount of memory that it failed to allocate. This seems like an irrelevant detail that could change over time and isn't required for determining if test passed. Typical elided text is '(requested 2148532224 bytes)'
-rw-r--r--testsuite/tests/rts/all.T6
1 files changed, 5 insertions, 1 deletions
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index a62585c6f4..7b31d159f3 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -82,6 +82,9 @@ test('divbyzero',
when(opsys('mingw32'), omit_ways(prof_ways))],
compile_and_run, ['-with-rtsopts="--generate-stack-traces=no"'])
+def remove_parenthesis(s):
+ return re.sub(r'\s+\([^)]*\)', '', s)
+
test('outofmem', [ when(opsys('darwin'), skip),
# this is believed to cause other processes to die
# that happen concurrently while the outofmem test
@@ -89,7 +92,8 @@ test('outofmem', [ when(opsys('darwin'), skip),
# windows, to prevent absolute exhaustion of memory
# and subsequent termination (and failure) of unrelated
# tests.
- when(opsys('mingw32'), skip) ],
+ when(opsys('mingw32'), skip),
+ normalise_errmsg_fun(remove_parenthesis)],
makefile_test, ['outofmem'])
test('outofmem2', normal, makefile_test, ['outofmem2'])