summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2016-07-01 11:16:08 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2016-07-01 11:17:50 +0200
commit0afc41b49e0ad227750421e5e2887ac9607c40fa (patch)
tree3f79a7a3ba52d9547424107f356b6da90a754891
parentb65363d3eaffd453ca0790b34a5a4dc4354e176a (diff)
downloadhaskell-0afc41b49e0ad227750421e5e2887ac9607c40fa.tar.gz
Testsuite: be less strict about topHandler03's stderr
Fixes #12343.
-rw-r--r--libraries/base/tests/all.T5
1 files changed, 4 insertions, 1 deletions
diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index df49172007..64ecc88ce8 100644
--- a/libraries/base/tests/all.T
+++ b/libraries/base/tests/all.T
@@ -143,6 +143,9 @@ test('CatEntail', normal, compile, [''])
test('T7653', high_memory_usage, compile_and_run, [''])
test('T7787', normal, compile_and_run, [''])
+def stderr_contains(pattern):
+ return normalise_errmsg_fun(lambda s: pattern if pattern in s else s)
+
test('topHandler01', when(opsys('mingw32'), skip), compile_and_run, [''])
test('topHandler02',
[when(opsys('mingw32'), skip),
@@ -150,7 +153,7 @@ test('topHandler02',
signal_exit_code(2)
], compile_and_run, [''])
test('topHandler03',
- [when(opsys('mingw32'), skip),
+ [when(opsys('mingw32'), skip), stderr_contains('Terminated'),
signal_exit_code(15)
], compile_and_run, [''])
test('topHandler04',