summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-06-03 11:34:42 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-06-05 19:23:46 -0400
commit3e343292353764847a7cb624167a850ee467f9ce (patch)
tree452015432b0514efb49976718c1c6093726a72ef
parent34424b9d7baa3e4e493f9a6063e3460151e35345 (diff)
downloadhaskell-3e343292353764847a7cb624167a850ee467f9ce.tar.gz
testsuite: Eliminate fragility of ioprof
As noted in #10037, the `ioprof` test would change its stderr output (specifically the stacktrace produced by `error`) depending upon optimisation level. As the `error` backtrace is not the point of this test, we now ignore the `stderr` output.
-rw-r--r--testsuite/tests/profiling/should_run/all.T3
-rw-r--r--testsuite/tests/profiling/should_run/ioprof.stderr13
2 files changed, 2 insertions, 14 deletions
diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index 14b98b189c..193afbfb3d 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -92,7 +92,8 @@ test('T949', [extra_ways(extra_prof_ways)], compile_and_run, [''])
test('ioprof',
[expect_broken_for_10037,
exit_code(1),
- omit_ways(['ghci-ext-prof']) # doesn't work with exit_code(1)
+ omit_ways(['ghci-ext-prof']), # doesn't work with exit_code(1)
+ ignore_stderr
],
compile_and_run,
['-fno-full-laziness -fno-state-hack']) # Note [consistent stacks]
diff --git a/testsuite/tests/profiling/should_run/ioprof.stderr b/testsuite/tests/profiling/should_run/ioprof.stderr
deleted file mode 100644
index 0cb2b4b174..0000000000
--- a/testsuite/tests/profiling/should_run/ioprof.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-ioprof: a
-CallStack (from HasCallStack):
- error, called at ioprof.hs:23:22 in main:Main
-CallStack (from -prof):
- Main.errorM.\ (ioprof.hs:23:22-28)
- Main.errorM (ioprof.hs:23:1-28)
- Main.foo (ioprof.hs:34:1-16)
- Main.>>=.\ (ioprof.hs:(11,27)-(12,50))
- Main.>>= (ioprof.hs:(11,3)-(12,50))
- Main.<*> (ioprof.hs:20:5-14)
- Main.bar (ioprof.hs:31:1-20)
- Main.runM (ioprof.hs:26:1-37)
- Main.main (ioprof.hs:28:1-43)