[commit: ghc] wip/T9858-typeable-ben2: testsuite: Fix GHCi test output (21f5833)

git at git.haskell.org git at git.haskell.org
Sat Sep 26 21:52:28 UTC 2015 

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

On branch  : wip/T9858-typeable-ben2
Link       : http://ghc.haskell.org/trac/ghc/changeset/21f583365970f58fc4a319c8a392002f372d4589/ghc

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

commit 21f583365970f58fc4a319c8a392002f372d4589
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Sep 23 20:31:12 2015 +0200

    testsuite: Fix GHCi test output


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

21f583365970f58fc4a319c8a392002f372d4589
 testsuite/tests/ghci.debugger/scripts/T2740.stdout       |  2 +-
 testsuite/tests/ghci.debugger/scripts/break009.stdout    |  4 ++--
 testsuite/tests/ghci.debugger/scripts/break010.stdout    |  4 ++--
 testsuite/tests/ghci.debugger/scripts/break011.stdout    |  8 ++++----
 testsuite/tests/ghci.debugger/scripts/break012.stdout    | 16 ++++++++--------
 testsuite/tests/ghci.debugger/scripts/break018.stdout    |  4 ++--
 .../tests/ghci.debugger/scripts/break022/break022.stdout |  2 +-
 testsuite/tests/ghci.debugger/scripts/break028.stdout    |  6 +++---
 testsuite/tests/ghci.debugger/scripts/print031.stdout    |  2 +-
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/testsuite/tests/ghci.debugger/scripts/T2740.stdout b/testsuite/tests/ghci.debugger/scripts/T2740.stdout
index c6733bc..1f3e6d9 100644
--- a/testsuite/tests/ghci.debugger/scripts/T2740.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/T2740.stdout
@@ -1,5 +1,5 @@
 Stopped at T2740.hs:(3,1)-(4,25)
-_result :: a = _
+_result :: a2 = _
 Stopped at T2740.hs:3:11-13
 _result :: Bool = _
 x :: Integer = 1
diff --git a/testsuite/tests/ghci.debugger/scripts/break009.stdout b/testsuite/tests/ghci.debugger/scripts/break009.stdout
index b926ed2..1454366 100644
--- a/testsuite/tests/ghci.debugger/scripts/break009.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break009.stdout
@@ -1,6 +1,6 @@
 Breakpoint 0 activated at ../Test6.hs:5:8-11
 Stopped at ../Test6.hs:5:8-11
-_result :: a = _
+_result :: a2 = _
 *** Exception: Prelude.head: empty list
 CallStack:
-  error, called at libraries/base/GHC/List.hs:1009:3 in base:GHC.List
+  error, called at libraries/base/GHC/List.hs:999:3 in base:GHC.List
diff --git a/testsuite/tests/ghci.debugger/scripts/break010.stdout b/testsuite/tests/ghci.debugger/scripts/break010.stdout
index 2751b6d..682f4c3 100644
--- a/testsuite/tests/ghci.debugger/scripts/break010.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break010.stdout
@@ -1,5 +1,5 @@
 Breakpoint 0 activated at ../Test6.hs:5:8-11
 Stopped at ../Test6.hs:5:8-11
-_result :: a = _
+_result :: a2 = _
 Stopped at ../Test6.hs:5:8-11
-_result :: a = _
+_result :: a2 = _
diff --git a/testsuite/tests/ghci.debugger/scripts/break011.stdout b/testsuite/tests/ghci.debugger/scripts/break011.stdout
index dafc1fc..67bbec7 100644
--- a/testsuite/tests/ghci.debugger/scripts/break011.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break011.stdout
@@ -9,12 +9,12 @@ _exception :: e = _
 -2  : main (../Test7.hs:2:8-29)
 <end of history>
 Logged breakpoint at ../Test7.hs:2:18-28
-_result :: a12
+_result :: a14
 Logged breakpoint at ../Test7.hs:2:8-29
-_result :: IO a12
+_result :: IO a14
 no more logged breakpoints
 Logged breakpoint at ../Test7.hs:2:18-28
-_result :: a12
+_result :: a14
 Stopped at <exception thrown>
 _exception :: e
 already at the beginning of the history
@@ -23,7 +23,7 @@ _exception = SomeException
                   "foo"
                   "CallStack:
   error, called at ../Test7.hs:2:18 in main:Main")
-_result :: a12 = _
+_result :: a14 = _
 _exception :: SomeException = SomeException
                                 (ErrorCallWithLocation
                                    "foo"
diff --git a/testsuite/tests/ghci.debugger/scripts/break012.stdout b/testsuite/tests/ghci.debugger/scripts/break012.stdout
index 70fa0f3..88e8b3e 100644
--- a/testsuite/tests/ghci.debugger/scripts/break012.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break012.stdout
@@ -1,16 +1,16 @@
 Stopped at break012.hs:(1,1)-(5,18)
-_result :: (t, a1 -> a1, (), a -> a -> a) = _
+_result :: (t, a3 -> a3, (), a2 -> a2 -> a2) = _
 Stopped at break012.hs:5:10-18
-_result :: (t, a1 -> a1, (), a -> a -> a) = _
+_result :: (t, a3 -> a3, (), a2 -> a2 -> a2) = _
 a :: t = _
-b :: a2 -> a2 = _
+b :: a4 -> a4 = _
 c :: () = _
-d :: a -> a -> a = _
+d :: a2 -> a2 -> a2 = _
 a :: t
-b :: a2 -> a2
+b :: a4 -> a4
 c :: ()
-d :: a -> a -> a
+d :: a2 -> a2 -> a2
 a = (_t1::t)
-b = (_t2::a2 -> a2)
+b = (_t2::a4 -> a4)
 c = (_t3::())
-d = (_t4::a -> a -> a)
+d = (_t4::a2 -> a2 -> a2)
diff --git a/testsuite/tests/ghci.debugger/scripts/break018.stdout b/testsuite/tests/ghci.debugger/scripts/break018.stdout
index a12e119..11ef547 100644
--- a/testsuite/tests/ghci.debugger/scripts/break018.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break018.stdout
@@ -1,5 +1,5 @@
 Stopped at ../mdo.hs:(30,1)-(32,27)
-_result :: IO (N a) = _
+_result :: IO (N a6) = _
 Stopped at ../mdo.hs:(30,16)-(32,27)
 _result :: IO (N Char) = _
 x :: Char = 'h'
@@ -10,4 +10,4 @@ f :: N Char = _
 l :: N Char = _
 x :: Char = 'h'
 Stopped at ../mdo.hs:(8,1)-(9,42)
-_result :: IO (N a) = _
+_result :: IO (N a6) = _
diff --git a/testsuite/tests/ghci.debugger/scripts/break022/break022.stdout b/testsuite/tests/ghci.debugger/scripts/break022/break022.stdout
index 99ac58d..a87ffce 100644
--- a/testsuite/tests/ghci.debugger/scripts/break022/break022.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break022/break022.stdout
@@ -1,6 +1,6 @@
 Breakpoint 0 activated at A.hs:4:1-9
 Stopped at A.hs:4:1-9
-_result :: a1 = _
+_result :: a3 = _
 Stopped at A.hs:4:7-9
 _result :: () = _
 x :: () = ()
diff --git a/testsuite/tests/ghci.debugger/scripts/break028.stdout b/testsuite/tests/ghci.debugger/scripts/break028.stdout
index 2438d73..896a241 100644
--- a/testsuite/tests/ghci.debugger/scripts/break028.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break028.stdout
@@ -1,5 +1,5 @@
 Stopped at break028.hs:15:1-24
-_result :: Id a = _
+_result :: Id a3 = _
 Stopped at break028.hs:15:23-24
-_result :: Id a = _
-x' :: Id a = _
+_result :: Id a3 = _
+x' :: Id a3 = _
diff --git a/testsuite/tests/ghci.debugger/scripts/print031.stdout b/testsuite/tests/ghci.debugger/scripts/print031.stdout
index 529b698..da3e142 100644
--- a/testsuite/tests/ghci.debugger/scripts/print031.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print031.stdout
@@ -4,5 +4,5 @@ Stopped at print031.hs:7:1-19
 _result :: Bool = _
 Stopped at print031.hs:7:7-19
 _result :: Bool = _
-x :: t (Phantom a) = [Just (Phantom 1)]
+x :: t (Phantom a5) = [Just (Phantom 1)]
 x = [Just (Phantom 1)]

More information about the ghc-commits mailing list