[commit: ghc] master: Testsuite: be less strict about topHandler03's stderr (0afc41b)

git at git.haskell.org git at git.haskell.org
Fri Jul 1 09:17:12 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0afc41b49e0ad227750421e5e2887ac9607c40fa/ghc

>---------------------------------------------------------------

commit 0afc41b49e0ad227750421e5e2887ac9607c40fa
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Jul 1 11:16:08 2016 +0200

    Testsuite: be less strict about topHandler03's stderr
    
    Fixes #12343.


>---------------------------------------------------------------

0afc41b49e0ad227750421e5e2887ac9607c40fa
 libraries/base/tests/all.T | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index df49172..64ecc88 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',



More information about the ghc-commits mailing list