[commit: ghc] ghc-8.6: testsuite: Fix up testsuite (26a7f85)

[git at git.haskell.org]

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

On branch  : ghc-8.6
Link       : http://ghc.haskell.org/trac/ghc/changeset/26a7f850d15b91ad68d1e28d467faba00bb79144/ghc

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

commit 26a7f850d15b91ad68d1e28d467faba00bb79144
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Jul 30 17:42:49 2018 -0400

    testsuite: Fix up testsuite


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

26a7f850d15b91ad68d1e28d467faba00bb79144
 testsuite/tests/partial-sigs/should_fail/T14584.stderr | 2 +-
 testsuite/tests/perf/haddock/all.T                     | 3 ++-
 testsuite/tests/perf/should_run/all.T                  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/testsuite/tests/partial-sigs/should_fail/T14584.stderr b/testsuite/tests/partial-sigs/should_fail/T14584.stderr
index c53c822..b7531aa 100644
--- a/testsuite/tests/partial-sigs/should_fail/T14584.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/T14584.stderr
@@ -11,7 +11,7 @@ T14584.hs:56:41: warning: [-Wdeferred-type-errors (in -Wdefault)]
         act @_ @_ @act (fromSing @m (sing @m @a :: Sing _))
 
 T14584.hs:56:50: warning: [-Wdeferred-type-errors (in -Wdefault)]
-    • Expected kind ‘m1’, but ‘a’ has kind ‘Type’
+    • Expected kind ‘m1’, but ‘a’ has kind ‘*’
     • In the type ‘a’
       In the second argument of ‘fromSing’, namely
         ‘(sing @m @a :: Sing _)’
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index 393a697..1ad98c7 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -10,7 +10,7 @@ test('haddock.base',
             # 2017-02-19                        24286343184 (x64/Windows) - Generalize kind of (->)
             # 2017-12-24                        18733710728 (x64/Windows) - Unknown
 
-          ,(wordsize(64), 24662232152, 5)
+          ,(wordsize(64), 26201242752, 5)
             # 2012-08-14:  5920822352 (amd64/Linux)
             # 2012-09-20:  5829972376 (amd64/Linux)
             # 2012-10-08:  5902601224 (amd64/Linux)
@@ -52,6 +52,7 @@ test('haddock.base',
             # 2018-04-20: 18971030224 (x86_64/Linux) - Cache coercion roles
             # 2018-05-14: 21123660336 (amd64/Linux) - D4659: strictness to fix space leaks
             # 2018-06-14: 24662232152 (amd64/Linux) - Bump haddock
+            # 2018-07-30: 26201242752 (amd64/Linux) - Bump haddock
 
           ,(platform('i386-unknown-mingw32'), 2885173512, 5)
             # 2013-02-10:                     3358693084 (x86/Windows)
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 0e7996ef..fb81376 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -465,11 +465,12 @@ test('T9203',
                       # 2016-04-06     84345136 (i386/Debian) not sure
                       # 2017-03-24     77969268 (x86/Linux, 64-bit machine) probably join points
 
-                      , (wordsize(64), 84620888, 5) ]),
+                      , (wordsize(64), 98360576, 5) ]),
                       # was            95747304
                       # 2019-09-10     94547280 post-AMP cleanup
                       # 2015-10-28     95451192 emit Typeable at definition site
                       # 2016-12-19     84620888 Join points
+                      # 2018-07-30     98360576 it's unclear
       only_ways(['normal'])],
      compile_and_run,
      ['-O2'])