diff --git a/testsuite/tests/backpack/should_compile/all.T b/testsuite/tests/backpack/should_compile/all.T index b6a830fbadb46f2ba2708f532c7119d8df85ea20..3ed26324dccaf675af3f730762acd208aab1598f 100644 --- a/testsuite/tests/backpack/should_compile/all.T +++ b/testsuite/tests/backpack/should_compile/all.T @@ -8,7 +8,7 @@ test('bkp11', normal, backpack_compile, ['']) test('bkp12', normal, backpack_compile, ['']) test('bkp14', normal, backpack_compile, ['']) test('bkp15', normal, backpack_compile, ['']) -test('bkp16', normalise_version('base', 'ghc-internal'), backpack_compile, ['']) +test('bkp16', [normalise_version('base', 'ghc-internal')], backpack_compile, ['-fhide-source-paths']) test('bkp17', normal, backpack_compile, ['']) test('bkp18', normal, backpack_compile, ['']) test('bkp19', normal, backpack_compile, ['']) @@ -60,4 +60,4 @@ test('T13214', normal, backpack_compile, ['']) test('T13250', normal, backpack_compile, ['']) test('T13323', normal, backpack_compile, ['']) test('T20396', normal, backpack_compile, ['']) -test('T23424', [ignore_stdout, ignore_stderr], backpack_compile, ['-ddump-rn-trace -ddump-if-trace -ddump-tc-trace']) \ No newline at end of file +test('T23424', [ignore_stdout, ignore_stderr], backpack_compile, ['-ddump-rn-trace -ddump-if-trace -ddump-tc-trace']) diff --git a/testsuite/tests/backpack/should_compile/bkp16.stderr b/testsuite/tests/backpack/should_compile/bkp16.stderr index 9489a7752fe80e78e6b2e4b615eaa35c559da65f..5e50948f1891fcf757fce14886ba3ee50b182a7f 100644 --- a/testsuite/tests/backpack/should_compile/bkp16.stderr +++ b/testsuite/tests/backpack/should_compile/bkp16.stderr @@ -1,9 +1,9 @@ [1 of 2] Processing p - [1 of 1] Compiling Int[sig] ( p/Int.hsig, nothing ) + [1 of 1] Compiling Int[sig] [2 of 2] Processing q Instantiating q [1 of 1] Including p[Int=base-4.20.0.0:GHC.Exts] Instantiating p[Int=base-4.20.0.0:GHC.Exts] [1 of 1] Including base-4.20.0.0 - [1 of 1] Compiling Int[sig] ( p/Int.hsig, bkp16.out/p/p-3JmGAx0a1DyKjX6bh7CxGJ/Int.o ) + [1 of 1] Compiling Int[sig] [1 of 1] Instantiating p diff --git a/testsuite/tests/backpack/should_fail/all.T b/testsuite/tests/backpack/should_fail/all.T index 8db576e5c873a5e8ed6f9c244c0ad792284d6a3f..0b2295d0ebe08b2e9c7a887fdde72acf325beb78 100644 --- a/testsuite/tests/backpack/should_fail/all.T +++ b/testsuite/tests/backpack/should_fail/all.T @@ -12,9 +12,9 @@ test('bkpfail13', normal, backpack_compile_fail, ['']) test('bkpfail14', normal, backpack_compile_fail, ['']) test('bkpfail15', normal, backpack_compile_fail, ['']) test('bkpfail16', normalise_version('ghc-internal', 'base'), backpack_compile_fail, ['']) -test('bkpfail17', normalise_version('ghc-internal', 'base'), backpack_compile_fail, ['']) +test('bkpfail17', normalise_version('ghc-internal', 'base'), backpack_compile_fail, ['-fhide-source-paths']) test('bkpfail18', normal, backpack_compile_fail, ['']) -test('bkpfail19', normalise_version('ghc-internal', 'base'), backpack_compile_fail, ['']) +test('bkpfail19', normalise_version('ghc-internal', 'base'), backpack_compile_fail, ['-fhide-source-paths']) test('bkpfail20', normal, backpack_compile_fail, ['']) test('bkpfail21', normal, backpack_compile_fail, ['']) test('bkpfail22', normal, backpack_compile_fail, ['']) diff --git a/testsuite/tests/backpack/should_fail/bkpfail17.stderr b/testsuite/tests/backpack/should_fail/bkpfail17.stderr index d5500a600ba77940e6a5ecd3185b890a198b15b8..d76898af8832b3c9ab04c57d51cdcf480efab864 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail17.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail17.stderr @@ -1,10 +1,10 @@ [1 of 2] Processing p - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) + [1 of 1] Compiling ShouldFail[sig] [2 of 2] Processing q Instantiating q [1 of 1] Including p[ShouldFail=base-4.20.0.0:Prelude] Instantiating p[ShouldFail=base-4.20.0.0:Prelude] - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail17.out/p/p-9R9TTjIBG3MEjwCQffKVYM/ShouldFail.o ) + [1 of 1] Compiling ShouldFail[sig] <no location info>: error: [GHC-15843] • Type constructor ‘Either’ has conflicting definitions in the module and its hsig file. diff --git a/testsuite/tests/backpack/should_fail/bkpfail19.stderr b/testsuite/tests/backpack/should_fail/bkpfail19.stderr index 9ae1c05019ca5b89743c2c8e071147bb0e40d2e4..bdb231480f452edeeb4aca5c0855b2d2cc7e407a 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail19.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail19.stderr @@ -1,10 +1,10 @@ [1 of 2] Processing p - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) + [1 of 1] Compiling ShouldFail[sig] [2 of 2] Processing q Instantiating q [1 of 1] Including p[ShouldFail=base-4.20.0.0:Data.STRef] Instantiating p[ShouldFail=base-4.20.0.0:Data.STRef] - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail19.out/p/p-Gwl8Z2CPH0M7Zi2wPSYSbs/ShouldFail.o ) + [1 of 1] Compiling ShouldFail[sig] <no location info>: error: [GHC-12424] • The hsig file (re)exports ‘Data.STRef.Lazy.newSTRef’ but the implementing module exports a different identifier ‘GHC.Internal.STRef.newSTRef’