[commit: ghc] fd/fix-travis: Relax test TH_addCStub2 so it succeeds on travis. (969bc7b)

[git at git.haskell.org]

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

On branch  : fd/fix-travis
Link       : http://ghc.haskell.org/trac/ghc/changeset/969bc7be4a26bf46bce0cf2a22b8487e3bb45dc4/ghc

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

commit 969bc7be4a26bf46bce0cf2a22b8487e3bb45dc4
Author: Facundo Domínguez <facundo.dominguez at tweag.io>
Date:   Thu Feb 9 23:20:17 2017 -0300

    Relax test TH_addCStub2 so it succeeds on travis.


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

969bc7be4a26bf46bce0cf2a22b8487e3bb45dc4
 testsuite/tests/th/TH_addCStub2.stderr |  5 -----
 testsuite/tests/th/all.T               | 11 ++++++++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/testsuite/tests/th/TH_addCStub2.stderr b/testsuite/tests/th/TH_addCStub2.stderr
index ba3277b..5095103 100644
--- a/testsuite/tests/th/TH_addCStub2.stderr
+++ b/testsuite/tests/th/TH_addCStub2.stderr
@@ -1,6 +1 @@
-
 TH_addCStub2.hs:13:13:
-     expected ‘;’, ‘,’ or ‘)’ before ‘{’ token
-          [ "#include <stdio.h>"
-                 ^
-`gcc' failed in phase `C Compiler'. (Exit code: 1)
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 9a08b65..f710089 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -63,8 +63,17 @@ test('TH_reifyDecl2', normal, compile, ['-v0'])
 test('TH_reifyLocalDefs', normal, compile, ['-v0'])
 test('TH_reifyLocalDefs2', normal, compile, ['-v0'])
 
+
+# Filters the output of an appended command with the given pattern.
+def grep_stderr_of(pattern):
+    swap12 = '3>&1 1>&2 2>&3 3>&-' # Swap file descriptors 1 and 2.
+    # pipefail: fail if the command fails
+    return('bash -o pipefail -c \'"$@" {swap12} | grep {pattern} {swap12}\' --'.format(**locals()))
+
 test('TH_addCStub1', normal, compile_and_run, ['-v0'])
-test('TH_addCStub2', normal, compile_fail, ['-v0'])
+test('TH_addCStub2',
+     [normal, compile_cmd_prefix(grep_stderr_of('TH_addCStub2.hs:13:13:'))]
+     , compile_fail, ['-v0'])
 
 test('TH_reifyMkName', normal, compile, ['-v0'])