[commit: ghc] master: Testsuite wibbles from previous commits. (de4df6b)

[git at git.haskell.org]

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

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

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

commit de4df6b41a227f527e9eb77733cd6c87b069d3d0
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sat Mar 12 15:52:22 2016 -0500

    Testsuite wibbles from previous commits.


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

de4df6b41a227f527e9eb77733cd6c87b069d3d0
 testsuite/tests/indexed-types/should_fail/T5439.stderr | 3 +++
 testsuite/tests/perf/compiler/all.T                    | 3 ++-
 testsuite/tests/polykinds/T9222.stderr                 | 2 +-
 testsuite/tests/typecheck/should_fail/T9260.stderr     | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/testsuite/tests/indexed-types/should_fail/T5439.stderr b/testsuite/tests/indexed-types/should_fail/T5439.stderr
index b0cf937..b76b0f9 100644
--- a/testsuite/tests/indexed-types/should_fail/T5439.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T5439.stderr
@@ -7,6 +7,9 @@ T5439.hs:82:33: error:
         ‘inj $ Failure (e :: SomeException)’
       In a stmt of a 'do' block:
         c <- complete ev $ inj $ Failure (e :: SomeException)
+      In the expression:
+        do { c <- complete ev $ inj $ Failure (e :: SomeException);
+             return $ c || not first }
     • Relevant bindings include
         register :: Bool -> Peano n -> WaitOps (HDrop n rs) -> IO Bool
           (bound at T5439.hs:64:9)
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index e7e467c..c19d51d 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -364,7 +364,7 @@ test('T5030',
            #                        of family-applications leads to less sharing, I think
            # 2015-07-11:  201882912 reason unknown
 
-           (wordsize(64), 653710960, 10)]),
+           (wordsize(64), 342331936, 10)]),
              # Previously 530000000 (+/- 10%)
              # 17/1/13:   602993184  (x86_64/Linux)
              #            (new demand analyser)
@@ -382,6 +382,7 @@ test('T5030',
              #                          of family-applications leads to less sharing, I think
              # 2015-03-17 403932600  tweak to solver algorithm
 	     # 2015-12-11 653710960  TypeInType (see #11196)
+	     # 2016-03-14 342331936  unify type families eagerly
 
        only_ways(['normal'])
       ],
diff --git a/testsuite/tests/polykinds/T9222.stderr b/testsuite/tests/polykinds/T9222.stderr
index 69e850c..b3d31ef 100644
--- a/testsuite/tests/polykinds/T9222.stderr
+++ b/testsuite/tests/polykinds/T9222.stderr
@@ -8,7 +8,7 @@ T9222.hs:13:3: error:
           at T9222.hs:13:3
       ‘b’ is a rigid type variable bound by
         the type of the constructor ‘Want’:
-          forall i j (a :: (i, j)) (b :: i) (c :: j).
+          forall i1 j1 (a :: (i1, j1)) (b :: i1) (c :: j1).
           ((a ~ '(b, c)) => Proxy b) -> Want a
         at T9222.hs:13:3
       Expected type: Proxy b0
diff --git a/testsuite/tests/typecheck/should_fail/T9260.stderr b/testsuite/tests/typecheck/should_fail/T9260.stderr
index 0773da2..37c37bd 100644
--- a/testsuite/tests/typecheck/should_fail/T9260.stderr
+++ b/testsuite/tests/typecheck/should_fail/T9260.stderr
@@ -2,6 +2,6 @@
 T9260.hs:12:8: error:
     • Couldn't match type ‘2’ with ‘1’
       Expected type: Fin 1
-        Actual type: Fin (1 + 1)
+        Actual type: Fin ((0 + 1) + 1)
     • In the expression: Fsucc Fzero
       In an equation for ‘test’: test = Fsucc Fzero