summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-07-30 21:58:32 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2015-07-30 22:50:07 +0200
commite273c67d0ae044f9fc4ffd1a889ddccf3d6bbc02 (patch)
tree84338e4b867568e7a36a776028671c943bf0e74e
parentb5097fe77f3d610db3eea8f659df927001bfcc10 (diff)
downloadhaskell-e273c67d0ae044f9fc4ffd1a889ddccf3d6bbc02.tar.gz
Testsuite: mark tests recently fixed as passing + accept new stderr
Update submodule array.
m---------libraries/array0
-rw-r--r--testsuite/tests/driver/recomp005/recomp005.stderr8
-rw-r--r--testsuite/tests/gadt/all.T2
-rw-r--r--testsuite/tests/typecheck/should_compile/T2497.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/all.T2
5 files changed, 9 insertions, 5 deletions
diff --git a/libraries/array b/libraries/array
-Subproject 604afd531aba4a96b066f6e59a08813107a9eed
+Subproject 68323b26865ec86a53237ca8974e82bf406a971
diff --git a/testsuite/tests/driver/recomp005/recomp005.stderr b/testsuite/tests/driver/recomp005/recomp005.stderr
index a34c8a78e1..0d437717fc 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 f458553116..9a48e69894 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 87b717ddbe..67e313c977 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 db9ad0e657..9ff759f908 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