diff options
Diffstat (limited to 'testsuite/tests')
14 files changed, 41 insertions, 45 deletions
diff --git a/testsuite/tests/backpack/should_compile/bkp58.stderr b/testsuite/tests/backpack/should_compile/bkp58.stderr index 3f36e43701..f7cffd24ba 100644 --- a/testsuite/tests/backpack/should_compile/bkp58.stderr +++ b/testsuite/tests/backpack/should_compile/bkp58.stderr @@ -5,8 +5,8 @@ Instantiating consumer-impl [1 of 1] Including common [1 of 3] Compiling Impl[boot] ( consumer-impl/Impl.hs-boot, bkp58.out/consumer-impl/Impl.o-boot ) - [2 of 3] Compiling Downstream ( consumer-impl/Downstream.hs, bkp58.out/consumer-impl/Downstream.o ) - [3 of 3] Compiling Impl ( consumer-impl/Impl.hs, bkp58.out/consumer-impl/Impl.o ) + [2 of 3] Compiling Impl ( consumer-impl/Impl.hs, bkp58.out/consumer-impl/Impl.o ) + [3 of 3] Compiling Downstream ( consumer-impl/Downstream.hs, bkp58.out/consumer-impl/Downstream.o ) [3 of 3] Processing tie Instantiating tie [1 of 1] Including consumer-impl diff --git a/testsuite/tests/backpack/should_compile/bkp60.stderr b/testsuite/tests/backpack/should_compile/bkp60.stderr index 6a5732b961..4af21f67ed 100644 --- a/testsuite/tests/backpack/should_compile/bkp60.stderr +++ b/testsuite/tests/backpack/should_compile/bkp60.stderr @@ -5,8 +5,8 @@ Instantiating consumer-impl [1 of 1] Including common [1 of 3] Compiling Impl[boot] ( consumer-impl/Impl.hs-boot, bkp60.out/consumer-impl/Impl.o-boot ) - [2 of 3] Compiling Downstream ( consumer-impl/Downstream.hs, bkp60.out/consumer-impl/Downstream.o ) - [3 of 3] Compiling Impl ( consumer-impl/Impl.hs, bkp60.out/consumer-impl/Impl.o ) + [2 of 3] Compiling Impl ( consumer-impl/Impl.hs, bkp60.out/consumer-impl/Impl.o ) + [3 of 3] Compiling Downstream ( consumer-impl/Downstream.hs, bkp60.out/consumer-impl/Downstream.o ) [3 of 3] Processing tie Instantiating tie [1 of 1] Including consumer-impl diff --git a/testsuite/tests/deriving/should_fail/T14365.stderr b/testsuite/tests/deriving/should_fail/T14365.stderr index a166953cf5..f8f106fea8 100644 --- a/testsuite/tests/deriving/should_fail/T14365.stderr +++ b/testsuite/tests/deriving/should_fail/T14365.stderr @@ -11,4 +11,3 @@ T14365B.hs-boot:7:1: error: Cannot derive instances in hs-boot files Write an instance declaration instead • In the stand-alone deriving instance for ‘Foldable Foo’ -[3 of 3] Compiling T14365B ( T14365B.hs, T14365B.o ) diff --git a/testsuite/tests/deriving/should_fail/T21087b.stderr b/testsuite/tests/deriving/should_fail/T21087b.stderr index 4caee4928e..6514e20ecf 100644 --- a/testsuite/tests/deriving/should_fail/T21087b.stderr +++ b/testsuite/tests/deriving/should_fail/T21087b.stderr @@ -3,8 +3,3 @@ T21087b_aux.hs-boot:11:25: error: • Class ‘KnownNat’ does not support user-specified instances. • In the stand-alone deriving instance for ‘KnownNat Z’ -[3 of 3] Compiling T21087b_aux ( T21087b_aux.hs, T21087b_aux.o ) - -T21087b_aux.hs:11:25: error: - • Class ‘KnownNat’ does not support user-specified instances. - • In the stand-alone deriving instance for ‘KnownNat Z’ diff --git a/testsuite/tests/driver/T14075/T14075.stdout b/testsuite/tests/driver/T14075/T14075.stdout index f5fac2d604..f84cd727f2 100644 --- a/testsuite/tests/driver/T14075/T14075.stdout +++ b/testsuite/tests/driver/T14075/T14075.stdout @@ -1,4 +1,5 @@ -[1 of 4] Compiling O ( O.hs, O.o ) -[2 of 4] Compiling F[boot] ( F.hs-boot, F.o-boot ) -[3 of 4] Compiling V ( V.hs, V.o ) -[4 of 4] Compiling F ( F.hs, F.o ) +[1 of 5] Compiling O ( O.hs, O.o ) +[2 of 5] Compiling F[boot] ( F.hs-boot, F.o-boot ) +[3 of 5] Compiling V[boot] ( V.hs-boot, V.o-boot ) +[4 of 5] Compiling V ( V.hs, V.o ) +[5 of 5] Compiling F ( F.hs, F.o ) diff --git a/testsuite/tests/driver/T20030/test1/T20030_test1.stderr b/testsuite/tests/driver/T20030/test1/T20030_test1.stderr index 81b29def80..8ee2810d59 100644 --- a/testsuite/tests/driver/T20030/test1/T20030_test1.stderr +++ b/testsuite/tests/driver/T20030/test1/T20030_test1.stderr @@ -9,5 +9,5 @@ [ 9 of 13] Compiling E ( E.hs, E.o ) [10 of 13] Compiling I ( I.hs, I.o ) [11 of 13] Compiling J[boot] ( J.hs-boot, J.o-boot ) -[12 of 13] Compiling K ( K.hs, K.o ) -[13 of 13] Compiling J ( J.hs, J.o ) +[12 of 13] Compiling J ( J.hs, J.o ) +[13 of 13] Compiling K ( K.hs, K.o ) diff --git a/testsuite/tests/driver/T20030/test1/T20030_test1j.stderr b/testsuite/tests/driver/T20030/test1/T20030_test1j.stderr index 81b29def80..8ee2810d59 100644 --- a/testsuite/tests/driver/T20030/test1/T20030_test1j.stderr +++ b/testsuite/tests/driver/T20030/test1/T20030_test1j.stderr @@ -9,5 +9,5 @@ [ 9 of 13] Compiling E ( E.hs, E.o ) [10 of 13] Compiling I ( I.hs, I.o ) [11 of 13] Compiling J[boot] ( J.hs-boot, J.o-boot ) -[12 of 13] Compiling K ( K.hs, K.o ) -[13 of 13] Compiling J ( J.hs, J.o ) +[12 of 13] Compiling J ( J.hs, J.o ) +[13 of 13] Compiling K ( K.hs, K.o ) diff --git a/testsuite/tests/driver/T20030/test3/T20030_test3.stderr b/testsuite/tests/driver/T20030/test3/T20030_test3.stderr index 91c3869e70..ffa4f5a95d 100644 --- a/testsuite/tests/driver/T20030/test3/T20030_test3.stderr +++ b/testsuite/tests/driver/T20030/test3/T20030_test3.stderr @@ -1,7 +1,8 @@ -[1 of 7] Compiling L[boot] ( L.hs-boot, L.o-boot ) -[2 of 7] Compiling M[boot] ( M.hs-boot, M.o-boot ) -[3 of 7] Compiling O[boot] ( O.hs-boot, O.o-boot ) -[4 of 7] Compiling O ( O.hs, O.o ) -[5 of 7] Compiling L ( L.hs, L.o ) -[6 of 7] Compiling M ( M.hs, M.o ) -[7 of 7] Compiling N ( N.hs, N.o ) +[1 of 8] Compiling L[boot] ( L.hs-boot, L.o-boot ) +[2 of 8] Compiling M[boot] ( M.hs-boot, M.o-boot ) +[3 of 8] Compiling O[boot] ( O.hs-boot, O.o-boot ) +[4 of 8] Compiling O ( O.hs, O.o ) +[5 of 8] Compiling L ( L.hs, L.o ) +[6 of 8] Compiling M ( M.hs, M.o ) +[7 of 8] Compiling N[boot] ( N.hs-boot, N.o-boot ) +[8 of 8] Compiling N ( N.hs, N.o ) diff --git a/testsuite/tests/driver/T20300/T20300.stderr b/testsuite/tests/driver/T20300/T20300.stderr index 37b55fd9c1..0698d9bf0e 100644 --- a/testsuite/tests/driver/T20300/T20300.stderr +++ b/testsuite/tests/driver/T20300/T20300.stderr @@ -1,4 +1,4 @@ [1 of 4] Compiling T[boot] ( T.hs-boot, nothing ) -[2 of 4] Compiling S ( S.hs, S.o, S.dyn_o ) -[3 of 4] Compiling T ( T.hs, nothing ) +[2 of 4] Compiling T ( T.hs, nothing ) +[3 of 4] Compiling S ( S.hs, S.o, S.dyn_o ) [4 of 4] Compiling Top ( Top.hs, nothing ) diff --git a/testsuite/tests/driver/recomp-boot-dyn-too/recomp-boot-dyn-too.stdout b/testsuite/tests/driver/recomp-boot-dyn-too/recomp-boot-dyn-too.stdout index e8ce474459..fc1844104f 100644 --- a/testsuite/tests/driver/recomp-boot-dyn-too/recomp-boot-dyn-too.stdout +++ b/testsuite/tests/driver/recomp-boot-dyn-too/recomp-boot-dyn-too.stdout @@ -1,4 +1,4 @@ -[1 of 2] Compiling A ( A.hs, A.o, A.dyn_o ) -[2 of 2] Compiling B ( B.hs, B.o, B.dyn_o ) [1 of 3] Compiling A[boot] ( A.hs-boot, A.o-boot, A.dyn_o-boot ) -[2 of 3] Compiling B ( B.hs, B.o, B.dyn_o ) [Source file changed] +[2 of 3] Compiling A ( A.hs, A.o, A.dyn_o ) +[3 of 3] Compiling B ( B.hs, B.o, B.dyn_o ) +[3 of 3] Compiling B ( B.hs, B.o, B.dyn_o ) [Source file changed] diff --git a/testsuite/tests/driver/recomp-boot/recomp-boot.stdout b/testsuite/tests/driver/recomp-boot/recomp-boot.stdout index 5aa4618bfc..b84488bec1 100644 --- a/testsuite/tests/driver/recomp-boot/recomp-boot.stdout +++ b/testsuite/tests/driver/recomp-boot/recomp-boot.stdout @@ -1,6 +1,6 @@ -[1 of 3] Compiling C ( C.hs, C.o ) -[2 of 3] Compiling B ( B.hs, B.o ) -[3 of 3] Compiling A ( A.hs, A.o ) [1 of 4] Compiling C[boot] ( C.hs-boot, C.o-boot ) -[2 of 4] Compiling B ( B.hs, B.o ) [Source file changed] -[3 of 4] Compiling A ( A.hs, A.o ) [B changed] +[2 of 4] Compiling C ( C.hs, C.o ) +[3 of 4] Compiling B ( B.hs, B.o ) +[4 of 4] Compiling A ( A.hs, A.o ) +[3 of 4] Compiling B ( B.hs, B.o ) [Source file changed] +[4 of 4] Compiling A ( A.hs, A.o ) [B changed] diff --git a/testsuite/tests/driver/recomp-boot2/recomp-boot2.stdout b/testsuite/tests/driver/recomp-boot2/recomp-boot2.stdout index 0ad0041e30..6e795da149 100644 --- a/testsuite/tests/driver/recomp-boot2/recomp-boot2.stdout +++ b/testsuite/tests/driver/recomp-boot2/recomp-boot2.stdout @@ -1,10 +1,10 @@ -[1 of 5] Compiling C ( C.hs, C.o ) -[2 of 5] Compiling B ( B.hs, B.o ) -[3 of 5] Compiling A ( A.hs, A.o ) -[4 of 5] Compiling M ( M.hs, M.o ) -[5 of 5] Compiling Top ( Top.hs, Top.o ) [1 of 6] Compiling C[boot] ( C.hs-boot, C.o-boot ) -[2 of 6] Compiling B ( B.hs, B.o ) [Source file changed] -[3 of 6] Compiling A ( A.hs, A.o ) [B changed] +[2 of 6] Compiling C ( C.hs, C.o ) +[3 of 6] Compiling B ( B.hs, B.o ) +[4 of 6] Compiling A ( A.hs, A.o ) +[5 of 6] Compiling M ( M.hs, M.o ) +[6 of 6] Compiling Top ( Top.hs, Top.o ) +[3 of 6] Compiling B ( B.hs, B.o ) [Source file changed] +[4 of 6] Compiling A ( A.hs, A.o ) [B changed] [5 of 6] Compiling M ( M.hs, M.o ) [A changed] [6 of 6] Compiling Top ( Top.hs, Top.o ) [M changed] diff --git a/testsuite/tests/ghci/T11827/all.T b/testsuite/tests/ghci/T11827/all.T index eee5b8849d..d29c6de795 100644 --- a/testsuite/tests/ghci/T11827/all.T +++ b/testsuite/tests/ghci/T11827/all.T @@ -1,2 +1,2 @@ test('T11827', [extra_files(['A.hs', 'A.hs-boot', 'B.hs']), - expect_broken(11827)], ghci_script, ['T11827.script']) + ], ghci_script, ['T11827.script']) diff --git a/testsuite/tests/ghci/scripts/T20217.stdout b/testsuite/tests/ghci/scripts/T20217.stdout index fa229321bf..49a5244c5f 100644 --- a/testsuite/tests/ghci/scripts/T20217.stdout +++ b/testsuite/tests/ghci/scripts/T20217.stdout @@ -1,5 +1,5 @@ [1 of 3] Compiling T20217A[boot] ( T20217A.hs-boot, nothing ) -[2 of 3] Compiling T20217 ( T20217.hs, nothing ) -[3 of 3] Compiling T20217A ( T20217A.hs, nothing ) +[2 of 3] Compiling T20217A ( T20217A.hs, nothing ) +[3 of 3] Compiling T20217 ( T20217.hs, nothing ) Ok, three modules loaded. Ok, three modules loaded. |