[commit: ghc] master: Testsuite: mark tests recently fixed as passing + accept new stderr (e273c67)

[git at git.haskell.org]

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

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

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

commit e273c67d0ae044f9fc4ffd1a889ddccf3d6bbc02
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Jul 30 21:58:32 2015 +0200

    Testsuite: mark tests recently fixed as passing + accept new stderr
    
    Update submodule array.


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

e273c67d0ae044f9fc4ffd1a889ddccf3d6bbc02
 libraries/array                                   | 2 +-
 testsuite/tests/driver/recomp005/recomp005.stderr | 8 ++++++--
 testsuite/tests/gadt/all.T                        | 2 +-
 testsuite/tests/typecheck/should_compile/T2497.hs | 2 +-
 testsuite/tests/typecheck/should_compile/all.T    | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/libraries/array b/libraries/array
index 604afd5..68323b2 160000
--- a/libraries/array
+++ b/libraries/array
@@ -1 +1 @@
-Subproject commit 604afd531aba4a96b066f6e59a08813107a9eed3
+Subproject commit 68323b26865ec86a53237ca8974e82bf406a9716
diff --git a/testsuite/tests/driver/recomp005/recomp005.stderr b/testsuite/tests/driver/recomp005/recomp005.stderr
index a34c8a7..0d43771 100644
--- a/testsuite/tests/driver/recomp005/recomp005.stderr
+++ b/testsuite/tests/driver/recomp005/recomp005.stderr
@@ -1,4 +1,8 @@
 
-C.hs:7:11: Warning:
+C.hs:7:11: warning:
     Rule "f/g" may never fire because ‘f’ might inline first
-    Probable fix: add an INLINE[n] or NOINLINE[n] pragma on ‘f’
+    Probable fix: add an INLINE[n] or NOINLINE[n] pragma for ‘f’
+
+C.hs:7:11: warning:
+    Rule "f/g" may never fire because ‘g’ might inline first
+    Probable fix: add an INLINE[n] or NOINLINE[n] pragma for ‘g’
diff --git a/testsuite/tests/gadt/all.T b/testsuite/tests/gadt/all.T
index f458553..9a48e69 100644
--- a/testsuite/tests/gadt/all.T
+++ b/testsuite/tests/gadt/all.T
@@ -70,7 +70,7 @@ test('karl2', normal, compile, [''])
 test('data1', normal, compile, [''])
 test('data2', normal, compile, [''])
 
-test('termination', expect_broken_for(10658, ['optasm', 'optllvm']), compile, [''])
+test('termination', normal, compile, [''])
 test('set', normal, compile, [''])
 test('scoped', normal, compile, [''])
 test('gadt-escape1', normal, compile_fail, [''])
diff --git a/testsuite/tests/typecheck/should_compile/T2497.hs b/testsuite/tests/typecheck/should_compile/T2497.hs
index 87b717d..67e313c 100644
--- a/testsuite/tests/typecheck/should_compile/T2497.hs
+++ b/testsuite/tests/typecheck/should_compile/T2497.hs
@@ -15,7 +15,7 @@ foo x = x
 
 eq,beq :: Eq a => a -> a -> Bool
 {-# NOINLINE [0] eq #-}
--- The pragma and [~1] in the RULE are to prevent an infinite loo
+-- The pragma and [~1] in the RULE are to prevent an infinite loop
 -- in the simplifier, where the RULE fires infinitely in its
 -- own RHS
 eq = (==)    -- Used
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index db9ad0e..9ff759f 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -283,7 +283,7 @@ test('T2433', extra_clean(['T2433_Help.hi', 'T2433_Help.o']),
      multimod_compile, ['T2433', '-v0'])
 test('T2494', normal, compile_fail, [''])
 test('T2494-2', normal, compile, [''])
-test('T2497', expect_broken_for(10657, ['optasm', 'optllvm']), compile, [''])
+test('T2497', normal, compile, [''])
 
 
 # Omitting temporarily