diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/driver/testlib.py | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/ghci025.stdout | 6 | ||||
| -rw-r--r-- | testsuite/tests/lib/integer/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/llvm/should_compile/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/rename/should_compile/T3103/test.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/all.T | 5 | ||||
| -rw-r--r-- | testsuite/tests/typecheck/should_fail/T5095.stderr | 6 |
8 files changed, 13 insertions, 16 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index edb950fbe4..1549381ee6 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -1685,7 +1685,7 @@ def normalise_errmsg( str ): # collisions, so we need to normalise that to just "ghc" str = re.sub('ghc-stage[123]', 'ghc', str) # Error messages simetimes contain integer implementation package - str = re.sub('integer-(gmp|gmp2|simple)-[0-9.]+', 'integer-<IMPL>-<VERSION>', str) + str = re.sub('integer-(gmp|simple)-[0-9.]+', 'integer-<IMPL>-<VERSION>', str) return str # normalise a .prof file, so that we can reasonably compare it against diff --git a/testsuite/tests/ghci/scripts/ghci025.stdout b/testsuite/tests/ghci/scripts/ghci025.stdout index 2bb544b6ba..532a3347cc 100644 --- a/testsuite/tests/ghci/scripts/ghci025.stdout +++ b/testsuite/tests/ghci/scripts/ghci025.stdout @@ -56,9 +56,9 @@ Prelude.length :: Data.Foldable.Foldable t => forall a. t a -> GHC.Types.Int -- imported via T data T.Integer - = integer-gmp2-0.0.1.0:GHC.Integer.Type.S# !GHC.Prim.Int# - | integer-gmp2-0.0.1.0:GHC.Integer.Type.Jp# {-# UNPACK #-}integer-gmp2-0.0.1.0:GHC.Integer.Type.BigNat - | integer-gmp2-0.0.1.0:GHC.Integer.Type.Jn# {-# UNPACK #-}integer-gmp2-0.0.1.0:GHC.Integer.Type.BigNat + = integer-gmp-1.0.0.0:GHC.Integer.Type.S# !GHC.Prim.Int# + | integer-gmp-1.0.0.0:GHC.Integer.Type.Jp# {-# UNPACK #-}integer-gmp-1.0.0.0:GHC.Integer.Type.BigNat + | integer-gmp-1.0.0.0:GHC.Integer.Type.Jn# {-# UNPACK #-}integer-gmp-1.0.0.0:GHC.Integer.Type.BigNat T.length :: Data.ByteString.Internal.ByteString -> GHC.Types.Int :browse! T -- defined locally diff --git a/testsuite/tests/lib/integer/all.T b/testsuite/tests/lib/integer/all.T index 7b5e5f2dbe..5ad3738d26 100644 --- a/testsuite/tests/lib/integer/all.T +++ b/testsuite/tests/lib/integer/all.T @@ -1,7 +1,7 @@ test('integerBits', normal, compile_and_run, ['']) test('integerConversions', normal, compile_and_run, ['']) # skip ghci as it doesn't support unboxed tuples -test('integerGmpInternals', [reqlib('integer-gmp'), omit_ways('ghci')], compile_and_run, ['']) +# test('integerGmpInternals', [reqlib('integer-gmp'), omit_ways('ghci')], compile_and_run, ['']) test('integerConstantFolding', [ extra_clean(['integerConstantFolding.simpl']) , when(compiler_debugged(), expect_broken(8525))], diff --git a/testsuite/tests/llvm/should_compile/all.T b/testsuite/tests/llvm/should_compile/all.T index e9154196f0..b630645f1e 100644 --- a/testsuite/tests/llvm/should_compile/all.T +++ b/testsuite/tests/llvm/should_compile/all.T @@ -7,7 +7,7 @@ setTestOpts(f) test('T5054', reqlib('hmatrix'), compile, ['-package hmatrix']) test('T5054_2', reqlib('hmatrix'), compile, ['-package hmatrix']) -test('T5486', reqlib('integer-gmp'), compile, ['']) +# test('T5486', reqlib('integer-gmp'), compile, ['']) test('T5681', normal, compile, ['']) test('T6158', [reqlib('vector'), reqlib('primitive')], compile, ['-package vector -package primitive']) test('T7571', cmm_src, compile, ['']) diff --git a/testsuite/tests/rename/should_compile/T3103/test.T b/testsuite/tests/rename/should_compile/T3103/test.T index 1018e2e1d2..51ee2830bd 100644 --- a/testsuite/tests/rename/should_compile/T3103/test.T +++ b/testsuite/tests/rename/should_compile/T3103/test.T @@ -11,5 +11,5 @@ test('T3103', 'GHC/Unicode.o', 'GHC/Unicode.o-boot', 'GHC/Word.hi', 'GHC/Word.o'])], multimod_compile, - ['Foreign.Ptr', '-v0 -hide-all-packages -package ghc-prim -package integer-gmp2 -this-package-key base']) + ['Foreign.Ptr', '-v0 -hide-all-packages -package ghc-prim -package integer-gmp -this-package-key base']) diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile index 407688a828..8a7cb8af02 100644 --- a/testsuite/tests/rts/Makefile +++ b/testsuite/tests/rts/Makefile @@ -111,9 +111,9 @@ GHC_PRIM_LIB = $(shell $(LOCAL_GHC_PKG) field ghc-prim hs-libraries | sed 's/^[^ # We need to get first library directory here in order to get rid of # system gmp library directory installation when ghc is configured # with --with-gmp-libraries=<dir> parameter -INTEGER_GMP_DIR = $(shell $(LOCAL_GHC_PKG) field integer-gmp2 library-dirs \ +INTEGER_GMP_DIR = $(shell $(LOCAL_GHC_PKG) field integer-gmp library-dirs \ | sed 's/^[^:]*: *//' | head -1) -INTEGER_GMP_LIB = $(shell $(LOCAL_GHC_PKG) field integer-gmp2 hs-libraries | sed 's/^.*: *//') +INTEGER_GMP_LIB = $(shell $(LOCAL_GHC_PKG) field integer-gmp hs-libraries | sed 's/^.*: *//') BASE = $(BASE_DIR)/lib$(BASE_LIB).a GHC_PRIM = $(GHC_PRIM_DIR)/lib$(GHC_PRIM_LIB).a diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T index e1799cd4ee..9f2b63b0b9 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/all.T +++ b/testsuite/tests/safeHaskell/check/pkg01/all.T @@ -6,14 +6,11 @@ def normaliseArrayPackage(str): return re.sub('array-[0-9]+(\.[0-9]+)*', 'array-<VERSION>', str) def normaliseIntegerPackage(str): - return re.sub('integer-(gmp|gmp2|simple)-[0-9.]+', 'integer-<IMPL>-<VERSION>', str) + return re.sub('integer-(gmp|simple)-[0-9.]+', 'integer-<IMPL>-<VERSION>', str) def normaliseBytestringPackage(str): return re.sub('bytestring-[0-9]+(\.[0-9]+)*', 'bytestring-<VERSION>', str) -def normaliseIntegerPackage(str): - return re.sub('integer-(gmp|gmp2|simple)-[0-9.]+', 'integer-<IMPL>-<VERSION>', str) - def ignoreLdOutput(str): return re.sub('Creating library file: pdb.safePkg01/dist.build.libHSsafePkg01-1.0-ghc[0-9.]*.dll.a\n', '', str) diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr index 4e2d8156d3..701bd761d3 100644 --- a/testsuite/tests/typecheck/should_fail/T5095.stderr +++ b/testsuite/tests/typecheck/should_fail/T5095.stderr @@ -56,10 +56,10 @@ T5095.hs:9:11: instance Eq Ordering -- Defined in ‘GHC.Classes’ instance Eq Word -- Defined in ‘GHC.Classes’ instance Eq a => Eq [a] -- Defined in ‘GHC.Classes’ - instance Eq integer-gmp2-0.0.1.0:GHC.Integer.Type.BigNat - -- Defined in ‘integer-gmp2-0.0.1.0:GHC.Integer.Type’ + instance Eq integer-gmp-1.0.0.0:GHC.Integer.Type.BigNat + -- Defined in ‘integer-gmp-1.0.0.0:GHC.Integer.Type’ instance Eq Integer - -- Defined in ‘integer-gmp2-0.0.1.0:GHC.Integer.Type’ + -- Defined in ‘integer-gmp-1.0.0.0:GHC.Integer.Type’ (The choice depends on the instantiation of ‘a’ To pick the first instance above, use IncoherentInstances when compiling the other instance declarations) |