Follow Integer library changes

testsuite/driver/testlib.py

@@ -1233,6 +1233,10 @@ def normalise_errmsg( str ):
     # The inplace ghc's are called ghc-stage[123] to avoid filename
     # collisions, so we need to normalise that to just "ghc"
     str = re.sub('ghc-stage[123]', 'ghc', str)
+    # We sometimes see the name of the integer-gmp package on stderr,
+    # but this can change (either the implementation name or the
+    # version number), so we canonicalise it here
+    str = re.sub('integer-[a-z]+-[0-9.]+', 'integer-impl', str)
     return str
 
 def normalise_slashes_( str ):

testsuite/tests/ghc-regress/annotations/should_fail/annfail12.stderr

@@ -7,6 +7,7 @@ annfail12.hs:5:0:
     In the annotation:
         {-# ANN f (error "You were meant to see this error!" :: Int) #-}
 Loading package ghc-prim ... linking ... done.
+Loading package integer-impl ... linking ... done.
 Loading package integer ... linking ... done.
 Loading package base ... linking ... done.
 Loading package ffi-1.0 ... linking ... done.

testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T

@@ -2,18 +2,18 @@ setTestOpts(composes([extra_run_opts('-ignore-dot-ghci'), normalise_slashes]))
 
 test('print001', normal, ghci_script, ['print001.script'])
 test('print002', normal, ghci_script, ['print002.script'])
-test('print003', normal, ghci_script, ['print003.script'])
+test('print003', expect_broken(3325), ghci_script, ['print003.script'])
 test('print004', normal, ghci_script, ['print004.script'])
-test('print005', normal, ghci_script, ['print005.script'])
-test('print006', normal, ghci_script, ['print006.script'])
+test('print005', expect_broken(3325), ghci_script, ['print005.script'])
+test('print006', expect_broken(3325), ghci_script, ['print006.script'])
 test('print007', normal, ghci_script, ['print007.script'])
 test('print008', normal, ghci_script, ['print008.script'])
 test('print009', normal, ghci_script, ['print009.script'])
-test('print010', normal, ghci_script, ['print010.script'])
+test('print010', expect_broken(3325), ghci_script, ['print010.script'])
 test('print011', normal, ghci_script, ['print011.script'])
-test('print012', normal, ghci_script, ['print012.script'])
+test('print012', expect_broken(3325), ghci_script, ['print012.script'])
 test('print013', normal, ghci_script, ['print013.script'])
-test('print014', normal, ghci_script, ['print014.script'])
+test('print014', expect_broken(3325), ghci_script, ['print014.script'])
 test('print016', normal, ghci_script, ['print016.script'])
 test('print017', normal, ghci_script, ['print017.script'])
 test('print018', normal, ghci_script, ['print018.script'])
@@ -37,11 +37,11 @@ test('print033',
      ['print033.script'])
 test('print034', normal, ghci_script, ['print034.script'])
 
-test('break001', normal, ghci_script, ['break001.script'])
+test('break001', expect_broken(3325), ghci_script, ['break001.script'])
 test('break002', normal, ghci_script, ['break002.script'])
 test('break003', normal, ghci_script, ['break003.script'])
 test('break005', normal, ghci_script, ['break005.script'])
-test('break006', normal, ghci_script, ['break006.script'])
+test('break006', expect_broken(3325), ghci_script, ['break006.script'])
 test('break007', normal, ghci_script, ['break007.script'])
 test('break008', normal, ghci_script, ['break008.script'])
 test('break009', normal, ghci_script, ['break009.script'])
@@ -59,7 +59,7 @@ test('break020', normal, ghci_script, ['break020.script'])
 test('break021', normal, ghci_script, ['break021.script'])
 test('break024', normal, ghci_script, ['break024.script'])
 test('break025', normal, ghci_script, ['break025.script'])
-test('break026', normal, ghci_script, ['break026.script'])
+test('break026', expect_broken(3325), ghci_script, ['break026.script'])
 test('break027', normal, ghci_script, ['break027.script'])
 test('break028', normal, ghci_script, ['break028.script'])
 
@@ -77,6 +77,6 @@ test('result001', expect_broken(1531), ghci_script, ['result001.script'])
 test('list001', normal, ghci_script, ['list001.script'])
 test('list002', normal, ghci_script, ['list002.script'])
 
-test('hist001', normal, ghci_script, ['hist001.script'])
+test('hist001', expect_broken(3325), ghci_script, ['hist001.script'])
 
-test('2740', normal, ghci_script, ['2740.script'])
+test('2740', expect_broken(3325), ghci_script, ['2740.script'])

testsuite/tests/ghc-regress/ghci/scripts/ghci025.stdout

 -- test :browse! functionality
 :browse! *T
 -- defined locally
-T.length :: GHC.Integer.Internals.Integer
+T.length :: GHC.Integer.Integer
 class N a
 class S a
 class C a b where
@@ -56,7 +56,7 @@ Prelude.length :: [a] -> GHC.Types.Int
 T.length :: Data.ByteString.Internal.ByteString -> GHC.Types.Int
 :browse! T
 -- defined locally
-T.length :: GHC.Integer.Internals.Integer
+T.length :: GHC.Integer.Integer
 class N a
 class S a
 class C a b where
@@ -70,7 +70,7 @@ c3 :: (C a b) => a1 -> b
 c4 :: (C a b) => a1 -> b
 :browse! T -- with -fglasgow-exts
 -- defined locally
-T.length :: GHC.Integer.Internals.Integer
+T.length :: GHC.Integer.Integer
 class N a
 class S a
 class C a b where

testsuite/tests/ghc-regress/indexed-types/should_compile/T3017.stderr

@@ -15,4 +15,4 @@ FAMILY INSTANCES
   type instance Elem (ListColl a) -- Defined at T3017.hs:13:8-11
 Tycons with generics:
 Dependent modules: []
-Dependent packages: [base, ghc-prim, integer]
+Dependent packages: [base, ghc-prim, integer, integer-impl]

testsuite/tests/ghc-regress/typecheck/should_compile/tc168.stderr

@@ -3,4 +3,4 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
 Tycons with generics:
 Dependent modules: []
-Dependent packages: [base, ghc-prim, integer]
+Dependent packages: [base, ghc-prim, integer, integer-impl]

testsuite/tests/ghc-regress/typecheck/should_compile/tc231.stderr

@@ -16,4 +16,4 @@ TYPE CONSTRUCTORS
         FamilyInstance: none
 Tycons with generics:
 Dependent modules: []
-Dependent packages: [base, ghc-prim, integer]
+Dependent packages: [base, ghc-prim, integer, integer-impl]