summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/driver/T20300/T20300.stderr2
-rw-r--r--testsuite/tests/driver/T20348/B.hs4
-rw-r--r--testsuite/tests/driver/T20348/Makefile2
-rw-r--r--testsuite/tests/driver/T20348/T20348.stdout3
-rw-r--r--testsuite/tests/driver/T20348/all.T2
-rw-r--r--testsuite/tests/driver/T20696/T20696.stderr2
-rw-r--r--testsuite/tests/driver/fat-iface/fat008.stdout6
-rw-r--r--testsuite/tests/driver/fat-iface/fat011.stderr4
-rw-r--r--testsuite/tests/driver/fat-iface/fat012.stderr4
-rw-r--r--testsuite/tests/driver/fat-iface/fat013.stderr4
-rw-r--r--testsuite/tests/driver/fat-iface/fat014.stdout4
-rw-r--r--testsuite/tests/driver/fat-iface/fat015.stderr8
-rw-r--r--testsuite/tests/driver/implicit-dyn-too/implicit-dyn-too.stdout4
13 files changed, 27 insertions, 22 deletions
diff --git a/testsuite/tests/driver/T20300/T20300.stderr b/testsuite/tests/driver/T20300/T20300.stderr
index 0698d9bf0e..0687f420dd 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 T ( T.hs, nothing )
-[3 of 4] Compiling S ( S.hs, S.o, S.dyn_o )
+[3 of 4] Compiling S ( S.hs, nothing )
[4 of 4] Compiling Top ( Top.hs, nothing )
diff --git a/testsuite/tests/driver/T20348/B.hs b/testsuite/tests/driver/T20348/B.hs
new file mode 100644
index 0000000000..4a022335de
--- /dev/null
+++ b/testsuite/tests/driver/T20348/B.hs
@@ -0,0 +1,4 @@
+{-# LANGUAGE TemplateHaskell #-}
+module B where
+
+import A
diff --git a/testsuite/tests/driver/T20348/Makefile b/testsuite/tests/driver/T20348/Makefile
index ba1edd021d..5b78c12bf5 100644
--- a/testsuite/tests/driver/T20348/Makefile
+++ b/testsuite/tests/driver/T20348/Makefile
@@ -15,7 +15,7 @@ clean:
T20348: clean
# First run: should produce .hi, .o, .dyn_hi, .dyn_o files.
echo 'first run'
- '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fwrite-interface A.hs
+ '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fwrite-interface B.hs
$(call checkExists,A.hi)
$(call checkExists,A.o)
$(call checkExists,A.dyn_hi)
diff --git a/testsuite/tests/driver/T20348/T20348.stdout b/testsuite/tests/driver/T20348/T20348.stdout
index 1763145c31..02f97c659b 100644
--- a/testsuite/tests/driver/T20348/T20348.stdout
+++ b/testsuite/tests/driver/T20348/T20348.stdout
@@ -1,3 +1,4 @@
first run
-[1 of 1] Compiling A ( A.hs, A.o, A.dyn_o )
+[1 of 2] Compiling A ( A.hs, A.o, A.dyn_o )
+[2 of 2] Compiling B ( B.hs, nothing )
second run
diff --git a/testsuite/tests/driver/T20348/all.T b/testsuite/tests/driver/T20348/all.T
index ce8f124d8a..969c436210 100644
--- a/testsuite/tests/driver/T20348/all.T
+++ b/testsuite/tests/driver/T20348/all.T
@@ -1,6 +1,6 @@
# N.B. this package requires a dynamically-linked ghc-bin, since it assumes
# that TH evaluation will build dynamic objects.
-test('T20348', [extra_files(['A.hs']), unless(have_dynamic(), skip)], makefile_test, [])
+test('T20348', [extra_files(['A.hs', 'B.hs']), unless(have_dynamic(), skip)], makefile_test, [])
test('T20348A', [extra_files(['A.hs']), unless(have_dynamic(), skip)], makefile_test, [])
test('T20348B', [extra_files(['A.hs']), unless(have_dynamic(), skip)], makefile_test, [])
test('T20348C', [extra_files(['A.hs']), unless(have_dynamic(), skip)], makefile_test, [])
diff --git a/testsuite/tests/driver/T20696/T20696.stderr b/testsuite/tests/driver/T20696/T20696.stderr
index de9a537caf..54d5ad5bdd 100644
--- a/testsuite/tests/driver/T20696/T20696.stderr
+++ b/testsuite/tests/driver/T20696/T20696.stderr
@@ -1,3 +1,3 @@
[1 of 3] Compiling C ( C.hs, C.o, C.dyn_o )
-[2 of 3] Compiling B ( B.hs, B.o, B.dyn_o )
+[2 of 3] Compiling B ( B.hs, B.o )
[3 of 3] Compiling A ( A.hs, A.o )
diff --git a/testsuite/tests/driver/fat-iface/fat008.stdout b/testsuite/tests/driver/fat-iface/fat008.stdout
index 8841ce10b2..0132be4e53 100644
--- a/testsuite/tests/driver/fat-iface/fat008.stdout
+++ b/testsuite/tests/driver/fat-iface/fat008.stdout
@@ -1,3 +1,3 @@
-[1 of 2] Compiling FatQuote ( FatQuote.hs, FatQuote.o, FatQuote.dyn_o )
-[2 of 2] Compiling FatTH ( FatTH.hs, FatTH.o, FatTH.dyn_o )
-[2 of 2] Compiling FatTH ( FatTH.hs, FatTH.o, FatTH.dyn_o ) [Source file changed]
+[1 of 2] Compiling FatQuote ( FatQuote.hs, FatQuote.o, interpreted )
+[2 of 2] Compiling FatTH ( FatTH.hs, FatTH.o )
+[2 of 2] Compiling FatTH ( FatTH.hs, FatTH.o ) [Source file changed]
diff --git a/testsuite/tests/driver/fat-iface/fat011.stderr b/testsuite/tests/driver/fat-iface/fat011.stderr
index 71fe78f06a..0fe4749423 100644
--- a/testsuite/tests/driver/fat-iface/fat011.stderr
+++ b/testsuite/tests/driver/fat-iface/fat011.stderr
@@ -1,4 +1,4 @@
-[1 of 4] Compiling FatQuote ( FatQuote.hs, FatQuote.o, FatQuote.dyn_o, interpreted )
-[2 of 4] Compiling FatTH ( FatTH.hs, FatTH.o, FatTH.dyn_o, interpreted )
+[1 of 4] Compiling FatQuote ( FatQuote.hs, FatQuote.o, interpreted )
+[2 of 4] Compiling FatTH ( FatTH.hs, FatTH.o, interpreted )
[3 of 4] Compiling Main ( FatMain.hs, FatMain.o, interpreted )
[4 of 4] Linking FatMain
diff --git a/testsuite/tests/driver/fat-iface/fat012.stderr b/testsuite/tests/driver/fat-iface/fat012.stderr
index 95ac650ae4..57a6befc70 100644
--- a/testsuite/tests/driver/fat-iface/fat012.stderr
+++ b/testsuite/tests/driver/fat-iface/fat012.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling FatQuote ( FatQuote.hs, FatQuote.o, FatQuote.dyn_o )
-[2 of 2] Compiling FatTH ( FatTH.hs, FatTH.o, FatTH.dyn_o )
+[1 of 2] Compiling FatQuote ( FatQuote.hs, FatQuote.o, interpreted )
+[2 of 2] Compiling FatTH ( FatTH.hs, FatTH.o )
diff --git a/testsuite/tests/driver/fat-iface/fat013.stderr b/testsuite/tests/driver/fat-iface/fat013.stderr
index bf181cfc4a..2be5eddb9a 100644
--- a/testsuite/tests/driver/fat-iface/fat013.stderr
+++ b/testsuite/tests/driver/fat-iface/fat013.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling FatQuote ( FatQuote.hs, /run/user/1000/ghc1303986_0/ghc_2.o, /run/user/1000/ghc1303986_0/ghc_2.dyn_o )
-[2 of 2] Compiling FatTH ( FatTH.hs, /run/user/1000/ghc1303986_0/ghc_4.o, /run/user/1000/ghc1303986_0/ghc_4.dyn_o )
+[1 of 2] Compiling FatQuote ( FatQuote.hs, interpreted )
+[2 of 2] Compiling FatTH ( FatTH.hs, nothing )
diff --git a/testsuite/tests/driver/fat-iface/fat014.stdout b/testsuite/tests/driver/fat-iface/fat014.stdout
index 52d0811a33..7bae3b3c03 100644
--- a/testsuite/tests/driver/fat-iface/fat014.stdout
+++ b/testsuite/tests/driver/fat-iface/fat014.stdout
@@ -1,3 +1,3 @@
-[1 of 2] Compiling FatQuote ( FatQuote.hs, /run/user/1000/ghc1304860_0/ghc_2.o )
-[2 of 2] Compiling FatTH ( FatTH.hs, /run/user/1000/ghc1304860_0/ghc_4.o )
+[1 of 2] Compiling FatQuote ( FatQuote.hs, interpreted )
+[2 of 2] Compiling FatTH ( FatTH.hs, nothing )
Ok, two modules loaded.
diff --git a/testsuite/tests/driver/fat-iface/fat015.stderr b/testsuite/tests/driver/fat-iface/fat015.stderr
index ba51cd4ab0..8fb5918730 100644
--- a/testsuite/tests/driver/fat-iface/fat015.stderr
+++ b/testsuite/tests/driver/fat-iface/fat015.stderr
@@ -1,6 +1,6 @@
-[1 of 6] Compiling FatQuote ( FatQuote.hs, FatQuote.o, FatQuote.dyn_o )
-[2 of 6] Compiling FatQuote1 ( FatQuote1.hs, FatQuote1.o, FatQuote1.dyn_o )
+[1 of 6] Compiling FatQuote ( FatQuote.hs, FatQuote.o, FatQuote.dyn_o, interpreted )
+[2 of 6] Compiling FatQuote1 ( FatQuote1.hs, interpreted )
[3 of 6] Compiling FatQuote2 ( FatQuote2.hs, FatQuote2.o, FatQuote2.dyn_o )
-[4 of 6] Compiling FatTH1 ( FatTH1.hs, FatTH1.o, FatTH1.dyn_o )
-[5 of 6] Compiling FatTH2 ( FatTH2.hs, FatTH2.o, FatTH2.dyn_o )
+[4 of 6] Compiling FatTH1 ( FatTH1.hs, nothing )
+[5 of 6] Compiling FatTH2 ( FatTH2.hs, nothing )
[6 of 6] Compiling FatTHTop ( FatTHTop.hs, nothing )
diff --git a/testsuite/tests/driver/implicit-dyn-too/implicit-dyn-too.stdout b/testsuite/tests/driver/implicit-dyn-too/implicit-dyn-too.stdout
index af7ea64403..d7546e6203 100644
--- a/testsuite/tests/driver/implicit-dyn-too/implicit-dyn-too.stdout
+++ b/testsuite/tests/driver/implicit-dyn-too/implicit-dyn-too.stdout
@@ -1,4 +1,4 @@
[1 of 2] Compiling QuasiExpr ( QuasiExpr.hs, QuasiExpr.o, QuasiExpr.dyn_o )
-[2 of 2] Compiling QuasiQuote ( QuasiQuote.hs, QuasiQuote.o, QuasiQuote.dyn_o )
+[2 of 2] Compiling QuasiQuote ( QuasiQuote.hs, nothing )
[1 of 2] Compiling QuasiExpr ( QuasiExpr.hs, QuasiExpr.o, QuasiExpr.dyn_o ) [Missing dynamic object file]
-[2 of 2] Compiling QuasiQuote ( QuasiQuote.hs, QuasiQuote.o, QuasiQuote.dyn_o ) [QuasiExpr[TH] changed]
+[2 of 2] Compiling QuasiQuote ( QuasiQuote.hs, nothing ) [QuasiExpr[TH] changed]
View Lorry Controller Status