diff options
Diffstat (limited to 'testsuite/tests/driver')
22 files changed, 102 insertions, 99 deletions
diff --git a/testsuite/tests/driver/T12983/T12983.stdout b/testsuite/tests/driver/T12983/T12983.stdout index 321e702d27..3e34b745fc 100644 --- a/testsuite/tests/driver/T12983/T12983.stdout +++ b/testsuite/tests/driver/T12983/T12983.stdout @@ -1,18 +1,18 @@ Preparing everyting with --make ... -[1 of 3] Compiling Hospital -[2 of 3] Compiling Types -[3 of 3] Compiling Main -Linking src/MetaHandler ... +[1 of 4] Compiling Hospital +[2 of 4] Compiling Types +[3 of 4] Compiling Main +[4 of 4] Linking src/MetaHandler Done with preparations with --make Building with --make -[1 of 4] Compiling ShortText -[2 of 4] Compiling Hospital [Source file changed] -[4 of 4] Compiling Main [Hospital[TH] changed] -Linking src/MetaHandler ... +[1 of 5] Compiling ShortText +[2 of 5] Compiling Hospital [Source file changed] +[4 of 5] Compiling Main [Hospital[TH] changed] +[5 of 5] Linking src/MetaHandler [Objects changed] Preparing everything ... src/Hospital.hs diff --git a/testsuite/tests/driver/T13914/T13914.stdout b/testsuite/tests/driver/T13914/T13914.stdout index d443ed47b9..6453a0011c 100644 --- a/testsuite/tests/driver/T13914/T13914.stdout +++ b/testsuite/tests/driver/T13914/T13914.stdout @@ -1,16 +1,16 @@ Without -fignore-asserts -[1 of 1] Compiling Main ( main.hs, main.o ) -Linking main ... +[1 of 2] Compiling Main ( main.hs, main.o ) +[2 of 2] Linking main main: Assertion failed CallStack (from HasCallStack): assert, called at main.hs:3:8 in main:Main With -fignore-asserts -[1 of 1] Compiling Main ( main.hs, main.o ) [Optimisation flags changed] -Linking main ... +[1 of 2] Compiling Main ( main.hs, main.o ) [Optimisation flags changed] +[2 of 2] Linking main [Objects changed] OK Without -fignore-asserts -[1 of 1] Compiling Main ( main.hs, main.o ) [Optimisation flags changed] -Linking main ... +[1 of 2] Compiling Main ( main.hs, main.o ) [Optimisation flags changed] +[2 of 2] Linking main [Objects changed] main: Assertion failed CallStack (from HasCallStack): assert, called at main.hs:3:8 in main:Main diff --git a/testsuite/tests/driver/T14075/F.hs b/testsuite/tests/driver/T14075/F.hs index 3e32036eb4..9d1234e366 100644 --- a/testsuite/tests/driver/T14075/F.hs +++ b/testsuite/tests/driver/T14075/F.hs @@ -1 +1,3 @@ module F () where + +import V diff --git a/testsuite/tests/driver/T16608/T16608_1.stdout b/testsuite/tests/driver/T16608/T16608_1.stdout index f925d67b8c..ce5a336950 100644 --- a/testsuite/tests/driver/T16608/T16608_1.stdout +++ b/testsuite/tests/driver/T16608/T16608_1.stdout @@ -1,7 +1,7 @@ -[1 of 2] Compiling MyInteger ( MyInteger.hs, MyInteger.o ) -[2 of 2] Compiling Main ( T16608_1.hs, T16608_1.o ) -Linking T16608_1 ... +[1 of 3] Compiling MyInteger ( MyInteger.hs, MyInteger.o ) +[2 of 3] Compiling Main ( T16608_1.hs, T16608_1.o ) +[3 of 3] Linking T16608_1 41 -[1 of 2] Compiling MyInteger ( MyInteger.hs, MyInteger.o ) [Source file changed] -Linking T16608_1 ... +[1 of 3] Compiling MyInteger ( MyInteger.hs, MyInteger.o ) [Source file changed] +[3 of 3] Linking T16608_1 [Objects changed] 42 diff --git a/testsuite/tests/driver/T16608/T16608_2.stdout b/testsuite/tests/driver/T16608/T16608_2.stdout index af2de7e698..8935c0bb3f 100644 --- a/testsuite/tests/driver/T16608/T16608_2.stdout +++ b/testsuite/tests/driver/T16608/T16608_2.stdout @@ -1,7 +1,7 @@ -[1 of 2] Compiling MyInteger ( MyInteger.hs, MyInteger.o ) -[2 of 2] Compiling Main ( T16608_2.hs, T16608_2.o ) -Linking T16608_2 ... +[1 of 3] Compiling MyInteger ( MyInteger.hs, MyInteger.o ) +[2 of 3] Compiling Main ( T16608_2.hs, T16608_2.o ) +[3 of 3] Linking T16608_2 41 -[1 of 2] Compiling MyInteger ( MyInteger.hs, MyInteger.o ) [Source file changed] -Linking T16608_2 ... +[1 of 3] Compiling MyInteger ( MyInteger.hs, MyInteger.o ) [Source file changed] +[3 of 3] Linking T16608_2 [Objects changed] 42 diff --git a/testsuite/tests/driver/T17481.stdout b/testsuite/tests/driver/T17481.stdout index 885dac3986..204b0ee2af 100644 --- a/testsuite/tests/driver/T17481.stdout +++ b/testsuite/tests/driver/T17481.stdout @@ -1,14 +1,14 @@ Main.hs is now: main = putStrLn "Hello from A" Compiling and running Main.hs: -[1 of 1] Compiling Main ( Main.hs, Main.o ) -Linking Main ... +[1 of 2] Compiling Main ( Main.hs, Main.o ) +[2 of 2] Linking Main Hello from A Main.hs is now: main = putStrLn "Hello from B" Compiling and running Main.hs: -[1 of 1] Compiling Main ( Main.hs, Main.o ) [Source file changed] -Linking Main ... +[1 of 2] Compiling Main ( Main.hs, Main.o ) [Source file changed] +[2 of 2] Linking Main [Objects changed] Hello from B Touching Main.hs Compiling and running Main.hs: diff --git a/testsuite/tests/driver/T17586/T17586.stdout b/testsuite/tests/driver/T17586/T17586.stdout index d0bb37090e..e541917636 100644 --- a/testsuite/tests/driver/T17586/T17586.stdout +++ b/testsuite/tests/driver/T17586/T17586.stdout @@ -1,6 +1,6 @@ -[1 of 1] Compiling Main ( T17586.hs, T17586.o ) -Linking T17586 ... +[1 of 2] Compiling Main ( T17586.hs, T17586.o ) +[2 of 2] Linking T17586 hello world -[1 of 1] Compiling Main ( T17586.hs, T17586.o ) [Flags changed] -Linking T17586 ... +[1 of 2] Compiling Main ( T17586.hs, T17586.o ) [Flags changed] +[2 of 2] Linking T17586 [Objects changed] hello world diff --git a/testsuite/tests/driver/T20300/T20300.stderr b/testsuite/tests/driver/T20300/T20300.stderr index 1a93d8d7ba..37b55fd9c1 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, T.o, T.dyn_o ) +[3 of 4] Compiling T ( T.hs, nothing ) [4 of 4] Compiling Top ( Top.hs, nothing ) diff --git a/testsuite/tests/driver/T20459.stderr b/testsuite/tests/driver/T20459.stderr index 63ae634930..f37ef0be3e 100644 --- a/testsuite/tests/driver/T20459.stderr +++ b/testsuite/tests/driver/T20459.stderr @@ -1,2 +1,2 @@ -Module imports form a cycle: +Module graph contains a cycle: module ‘T20459A’ (./T20459A.hs) imports itself diff --git a/testsuite/tests/driver/T437/T437.stdout b/testsuite/tests/driver/T437/T437.stdout index 2057b5df86..3dd0b5cc3b 100644 --- a/testsuite/tests/driver/T437/T437.stdout +++ b/testsuite/tests/driver/T437/T437.stdout @@ -1,10 +1,10 @@ -[1 of 2] Compiling Test2 ( Test2.hs, Test2.o ) -[2 of 2] Compiling Test ( Test.hs, Test.o ) -Linking Test ... -[1 of 1] Compiling Test2 ( Test2.hs, Test2.o ) [Flags changed] -Linking Test2 ... +[1 of 3] Compiling Test2 ( Test2.hs, Test2.o ) +[2 of 3] Compiling Test ( Test.hs, Test.o ) +[3 of 3] Linking Test +[1 of 2] Compiling Test2 ( Test2.hs, Test2.o ) [Flags changed] +[2 of 2] Linking Test2 "Test2.doit" "Test2.main" -[1 of 1] Compiling Test2 ( Test2.hs, Test2.o ) [Flags changed] -Linking Test2 ... +[1 of 2] Compiling Test2 ( Test2.hs, Test2.o ) [Flags changed] +[2 of 2] Linking Test2 [Objects changed] "Test2.doit" diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T index be93ec1d51..62cbf27e8c 100644 --- a/testsuite/tests/driver/all.T +++ b/testsuite/tests/driver/all.T @@ -299,3 +299,4 @@ test('T20439', normal, run_command, {compiler} -E -fno-code -XCPP -v Foo.hs 2>&1 | grep "Copying" | sed "s/.*to//" ']) test('T20459', normal, multimod_compile_fail, ['T20459B', '']) +test('MultiRootsErr', normal, multimod_compile_fail, ['MultiRootsErr', 'MultiRootsErr']) diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeA.stdout b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeA.stdout index d80c899cb1..76ad05bb37 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeA.stdout +++ b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeA.stdout @@ -1,6 +1,6 @@ -[1 of 3] Compiling A ( A.hs, A.o, A.dyn_o ) -[2 of 3] Compiling B ( B.hs, B.o, B.dyn_o ) -[3 of 3] Compiling Main ( C.hs, C.o, C.dyn_o ) -Linking C ... -[2 of 3] Compiling B ( B.hs, B.o, B.dyn_o ) [Missing dynamic interface file] -Linking C ... +[1 of 4] Compiling A ( A.hs, A.o, A.dyn_o ) +[2 of 4] Compiling B ( B.hs, B.o, B.dyn_o ) +[3 of 4] Compiling Main ( C.hs, C.o, C.dyn_o ) +[4 of 4] Linking C +[2 of 4] Compiling B ( B.hs, B.o, B.dyn_o ) [Missing dynamic interface file] +[4 of 4] Linking C [Objects changed] diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeB.stdout b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeB.stdout index 56caf28582..1e2de97295 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeB.stdout +++ b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeB.stdout @@ -1,3 +1,3 @@ -[2 of 3] Compiling B ( B.hs, B.o, B.dyn_o ) [Mismatched dynamic interface file] -[3 of 3] Compiling Main ( C.hs, C.o, C.dyn_o ) -Linking C ... +[2 of 4] Compiling B ( B.hs, B.o, B.dyn_o ) [Mismatched dynamic interface file] +[3 of 4] Compiling Main ( C.hs, C.o, C.dyn_o ) +[4 of 4] Linking C diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout b/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout index 5c33cb2e7a..243efe5829 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout +++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling Main ( Main.hs, Main.o, Main.dyn_o ) -Linking Main ... +[1 of 2] Compiling Main ( Main.hs, Main.o, Main.dyn_o ) +[2 of 2] Linking Main diff --git a/testsuite/tests/driver/recomp007/recomp007.stdout b/testsuite/tests/driver/recomp007/recomp007.stdout index 1160663b4d..c6b194ef17 100644 --- a/testsuite/tests/driver/recomp007/recomp007.stdout +++ b/testsuite/tests/driver/recomp007/recomp007.stdout @@ -1,6 +1,6 @@ "1.0" Preprocessing executable 'test' for b-1.0.. Building executable 'test' for b-1.0.. -[1 of 2] Compiling B ( B.hs, dist/build/test/test-tmp/B.o ) [A package changed] -Linking dist/build/test/test ... +[1 of 3] Compiling B ( B.hs, dist/build/test/test-tmp/B.o ) [A package changed] +[3 of 3] Linking dist/build/test/test [Objects changed] "2.0" diff --git a/testsuite/tests/driver/recomp011/recomp011.stdout b/testsuite/tests/driver/recomp011/recomp011.stdout index d3e0b92508..c320549f54 100644 --- a/testsuite/tests/driver/recomp011/recomp011.stdout +++ b/testsuite/tests/driver/recomp011/recomp011.stdout @@ -1,10 +1,10 @@ -[1 of 1] Compiling Main ( Main.hs, Main.o ) -Linking Main ... +[1 of 2] Compiling Main ( Main.hs, Main.o ) +[2 of 2] Linking Main 42 -[1 of 1] Compiling Main ( Main.hs, Main.o ) [B.hsinc changed] -Linking Main ... +[1 of 2] Compiling Main ( Main.hs, Main.o ) [B.hsinc changed] +[2 of 2] Linking Main [Objects changed] 43 -[1 of 1] Compiling Main ( Main.hs, Main.o ) [A.hsinc changed] -Linking Main ... +[1 of 2] Compiling Main ( Main.hs, Main.o ) [A.hsinc changed] +[2 of 2] Linking Main [Objects changed] 4343 4343 diff --git a/testsuite/tests/driver/recomp015/recomp015.stdout b/testsuite/tests/driver/recomp015/recomp015.stdout index a7dbad203a..2de39b6c87 100644 --- a/testsuite/tests/driver/recomp015/recomp015.stdout +++ b/testsuite/tests/driver/recomp015/recomp015.stdout @@ -1,6 +1,6 @@ -[1 of 1] Compiling Main ( Generate.hs, Generate.o ) -Linking Generate ... -[1 of 1] Compiling Main ( Main.hs, Main.o ) -Linking Main ... +[1 of 2] Compiling Main ( Generate.hs, Generate.o ) +[2 of 2] Linking Generate +[1 of 2] Compiling Main ( Main.hs, Main.o ) +[2 of 2] Linking Main Running main... Running main... diff --git a/testsuite/tests/driver/recomp019/recomp019.stdout b/testsuite/tests/driver/recomp019/recomp019.stdout index 413dad2e0f..300fe27867 100644 --- a/testsuite/tests/driver/recomp019/recomp019.stdout +++ b/testsuite/tests/driver/recomp019/recomp019.stdout @@ -1,11 +1,11 @@ first run -[1 of 3] Compiling B ( B.hs, B.o ) -[2 of 3] Compiling C ( C.hs, C.o ) -[3 of 3] Compiling Main ( Main.hs, Main.o ) -Linking Main ... +[1 of 4] Compiling B ( B.hs, B.o ) +[2 of 4] Compiling C ( C.hs, C.o ) +[3 of 4] Compiling Main ( Main.hs, Main.o ) +[4 of 4] Linking Main 5 [1 of 1] Compiling B ( B.hs, nothing ) [Source file changed] second run -[1 of 3] Compiling B ( B.hs, B.o ) [Missing object file] -Linking Main ... +[1 of 4] Compiling B ( B.hs, B.o ) [Missing object file] +[4 of 4] Linking Main [Objects changed] 15 diff --git a/testsuite/tests/driver/recompChangedPackage/recompChangedPackage.stdout b/testsuite/tests/driver/recompChangedPackage/recompChangedPackage.stdout index 86d6324225..ee1cbe982d 100644 --- a/testsuite/tests/driver/recompChangedPackage/recompChangedPackage.stdout +++ b/testsuite/tests/driver/recompChangedPackage/recompChangedPackage.stdout @@ -1,10 +1,10 @@ -[1 of 2] Compiling PLib ( PLib.hs, PLib.o ) -[2 of 2] Compiling Main ( Main.hs, Main.o ) -Linking Main ... +[1 of 3] Compiling PLib ( PLib.hs, PLib.o ) +[2 of 3] Compiling Main ( Main.hs, Main.o ) +[3 of 3] Linking Main "q" tmp.d q-0.1.0.0 -[1 of 1] Compiling Main ( Main.hs, Main.o ) [PLib removed] -Linking Main ... +[1 of 2] Compiling Main ( Main.hs, Main.o ) [PLib removed] +[2 of 2] Linking Main [Objects changed] empty diff --git a/testsuite/tests/driver/retc001/retc001.stdout b/testsuite/tests/driver/retc001/retc001.stdout index e5d374608e..a5bdd0597e 100644 --- a/testsuite/tests/driver/retc001/retc001.stdout +++ b/testsuite/tests/driver/retc001/retc001.stdout @@ -1,7 +1,7 @@ -[1 of 3] Compiling A ( A.hs, nothing ) -[2 of 3] Compiling B ( B.hs, nothing ) -[3 of 3] Compiling Main ( C.hs, nothing ) +[1 of 4] Compiling A ( A.hs, nothing ) +[2 of 4] Compiling B ( B.hs, nothing ) +[3 of 4] Compiling Main ( C.hs, nothing ) Middle End -[2 of 3] Compiling B ( B.hs, nothing ) [Source file changed] -[3 of 3] Compiling Main ( C.hs, nothing ) [B changed] +[2 of 4] Compiling B ( B.hs, nothing ) [Source file changed] +[3 of 4] Compiling Main ( C.hs, nothing ) [B changed] diff --git a/testsuite/tests/driver/should_fail/T10895.stderr b/testsuite/tests/driver/should_fail/T10895.stderr index 3ae52a3ef7..ff8a380809 100644 --- a/testsuite/tests/driver/should_fail/T10895.stderr +++ b/testsuite/tests/driver/should_fail/T10895.stderr @@ -1,4 +1,4 @@ <no location info>: error: - output was redirected with -o, but no output will be generated -because there is no Main module. + Output was redirected with -o, but no output will be generated. + There is no module named ‘Main’. diff --git a/testsuite/tests/driver/th-new-test/th-new-test.stdout b/testsuite/tests/driver/th-new-test/th-new-test.stdout index 7f31ce608f..5de19bdd0a 100644 --- a/testsuite/tests/driver/th-new-test/th-new-test.stdout +++ b/testsuite/tests/driver/th-new-test/th-new-test.stdout @@ -1,17 +1,17 @@ -[1 of 5] Compiling B -[2 of 5] Compiling A -[3 of 5] Compiling D -[4 of 5] Compiling C -[5 of 5] Compiling Main -Linking Main ... -[1 of 5] Compiling B [Source file changed] -[2 of 5] Compiling A [B[TH] changed] -Linking Main ... -[3 of 5] Compiling D [Source file changed] -[4 of 5] Compiling C [D[TH] changed] -Linking Main ... -[1 of 5] Compiling B [Source file changed] -[2 of 5] Compiling A [B[TH] changed] -[3 of 5] Compiling D [Source file changed] -[4 of 5] Compiling C [D[TH] changed] -Linking Main ... +[1 of 6] Compiling B +[2 of 6] Compiling A +[3 of 6] Compiling D +[4 of 6] Compiling C +[5 of 6] Compiling Main +[6 of 6] Linking Main +[1 of 6] Compiling B [Source file changed] +[2 of 6] Compiling A [B[TH] changed] +[6 of 6] Linking Main [Objects changed] +[3 of 6] Compiling D [Source file changed] +[4 of 6] Compiling C [D[TH] changed] +[6 of 6] Linking Main [Objects changed] +[1 of 6] Compiling B [Source file changed] +[2 of 6] Compiling A [B[TH] changed] +[3 of 6] Compiling D [Source file changed] +[4 of 6] Compiling C [D[TH] changed] +[6 of 6] Linking Main [Objects changed] |