summaryrefslogtreecommitdiff
path: root/testsuite/tests/driver
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2016-11-29 13:39:28 -0500
committerBen Gamari <ben@smart-cactus.org>2016-11-29 14:39:55 -0500
commit3ec856308cbfb89299daba56337eda866ac88d6e (patch)
treeea241b4618597a1d043acd96d2fb98e1476fcb81 /testsuite/tests/driver
parent2d99da0b230128440e12df9556dc15789be36ef8 (diff)
downloadhaskell-3ec856308cbfb89299daba56337eda866ac88d6e.tar.gz
Replace -fshow-source-paths with -fhide-source-paths
This patch reverts the change introduced with 587dcccfdfa7a319e27300a4f3885071060b1f8e and restores the previous default output of GHC (i.e., show source path and object path for each compiled module). The -fhide-source-paths flag can be used to hide these paths and reduce the line noise. Reviewers: gracjan, nomeata, austin, bgamari, simonmar, hvr Reviewed By: hvr Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D2728 GHC Trac Issues: #12851
Diffstat (limited to 'testsuite/tests/driver')
-rw-r--r--testsuite/tests/driver/T437/T437.stdout8
-rw-r--r--testsuite/tests/driver/T8526/T8526.stdout4
-rw-r--r--testsuite/tests/driver/recomp002/recomp002.stdout6
-rw-r--r--testsuite/tests/driver/recomp005/recomp005.stdout16
-rw-r--r--testsuite/tests/driver/recomp006/recomp006.stdout4
-rw-r--r--testsuite/tests/driver/recomp007/recomp007.stdout4
-rw-r--r--testsuite/tests/driver/recomp011/recomp011.stdout6
-rw-r--r--testsuite/tests/driver/recomp013/recomp013.stdout10
-rw-r--r--testsuite/tests/driver/recomp015/recomp015.stdout4
-rw-r--r--testsuite/tests/driver/recomp016/recomp016.stdout20
-rw-r--r--testsuite/tests/driver/retc001/retc001.stdout10
-rw-r--r--testsuite/tests/driver/retc002/retc002.stdout6
-rw-r--r--testsuite/tests/driver/write_interface_make.stdout2
13 files changed, 50 insertions, 50 deletions
diff --git a/testsuite/tests/driver/T437/T437.stdout b/testsuite/tests/driver/T437/T437.stdout
index 7490c96635..7508a5f9e0 100644
--- a/testsuite/tests/driver/T437/T437.stdout
+++ b/testsuite/tests/driver/T437/T437.stdout
@@ -1,10 +1,10 @@
-[1 of 2] Compiling Test2 (.hs -> .o)
-[2 of 2] Compiling Test (.hs -> .o)
+[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 (.hs -> .o) [flags changed]
+[1 of 1] Compiling Test2 ( Test2.hs, Test2.o ) [flags changed]
Linking Test2 ...
"Test2.doit"
"Test2.main"
-[1 of 1] Compiling Test2 (.hs -> .o) [flags changed]
+[1 of 1] Compiling Test2 ( Test2.hs, Test2.o ) [flags changed]
Linking Test2 ...
"Test2.doit"
diff --git a/testsuite/tests/driver/T8526/T8526.stdout b/testsuite/tests/driver/T8526/T8526.stdout
index bbe21c0f36..3b24506774 100644
--- a/testsuite/tests/driver/T8526/T8526.stdout
+++ b/testsuite/tests/driver/T8526/T8526.stdout
@@ -1,6 +1,6 @@
-[1 of 1] Compiling A (.hs -> interpreted)
+[1 of 1] Compiling A ( A.hs, interpreted )
Ok, modules loaded: A.
True
-[1 of 1] Compiling A (.hs -> interpreted)
+[1 of 1] Compiling A ( A.hs, interpreted )
Ok, modules loaded: A.
False
diff --git a/testsuite/tests/driver/recomp002/recomp002.stdout b/testsuite/tests/driver/recomp002/recomp002.stdout
index db014ffc8a..d9ddb2523a 100644
--- a/testsuite/tests/driver/recomp002/recomp002.stdout
+++ b/testsuite/tests/driver/recomp002/recomp002.stdout
@@ -1,3 +1,3 @@
-[1 of 3] Compiling W[boot] (.hs-boot -> .o-boot)
-[2 of 3] Compiling Q (.hs -> .o)
-[3 of 3] Compiling W (.hs -> .o)
+[1 of 3] Compiling W[boot] ( W.hs-boot, W.o-boot )
+[2 of 3] Compiling Q ( Q.hs, Q.o )
+[3 of 3] Compiling W ( W.hs, W.o )
diff --git a/testsuite/tests/driver/recomp005/recomp005.stdout b/testsuite/tests/driver/recomp005/recomp005.stdout
index e5b49a7ff2..6e2581ed04 100644
--- a/testsuite/tests/driver/recomp005/recomp005.stdout
+++ b/testsuite/tests/driver/recomp005/recomp005.stdout
@@ -1,8 +1,8 @@
-[1 of 5] Compiling A (.hs -> .o)
-[2 of 5] Compiling B (.hs -> .o)
-[3 of 5] Compiling C (.hs -> .o)
-[4 of 5] Compiling D (.hs -> .o)
-[5 of 5] Compiling E (.hs -> .o)
-[3 of 5] Compiling C (.hs -> .o)
-[4 of 5] Compiling D (.hs -> .o) [C changed]
-[5 of 5] Compiling E (.hs -> .o) [D changed]
+[1 of 5] Compiling A ( A.hs, A.o )
+[2 of 5] Compiling B ( B.hs, B.o )
+[3 of 5] Compiling C ( C.hs, C.o )
+[4 of 5] Compiling D ( D.hs, D.o )
+[5 of 5] Compiling E ( E.hs, E.o )
+[3 of 5] Compiling C ( C.hs, C.o )
+[4 of 5] Compiling D ( D.hs, D.o ) [C changed]
+[5 of 5] Compiling E ( E.hs, E.o ) [D changed]
diff --git a/testsuite/tests/driver/recomp006/recomp006.stdout b/testsuite/tests/driver/recomp006/recomp006.stdout
index 0319ceb9da..499b06f08b 100644
--- a/testsuite/tests/driver/recomp006/recomp006.stdout
+++ b/testsuite/tests/driver/recomp006/recomp006.stdout
@@ -1,2 +1,2 @@
-[1 of 2] Compiling B (.hs -> .o)
-[2 of 2] Compiling A (.hs -> .o) [B changed]
+[1 of 2] Compiling B ( B.hs, B.o )
+[2 of 2] Compiling A ( A.hs, A.o ) [B changed]
diff --git a/testsuite/tests/driver/recomp007/recomp007.stdout b/testsuite/tests/driver/recomp007/recomp007.stdout
index 347036a9ec..6230acfb02 100644
--- a/testsuite/tests/driver/recomp007/recomp007.stdout
+++ b/testsuite/tests/driver/recomp007/recomp007.stdout
@@ -1,4 +1,4 @@
Preprocessing executable 'test' for b-1.0...
-[1 of 2] Compiling B (.hs -> .o) [A changed]
-[2 of 2] Compiling Main (.hs -> .o) [B changed]
+[1 of 2] Compiling B ( B.hs, dist/build/test/test-tmp/B.o ) [A changed]
+[2 of 2] Compiling Main ( Main.hs, dist/build/test/test-tmp/Main.o ) [B changed]
Linking dist/build/test/test ...
diff --git a/testsuite/tests/driver/recomp011/recomp011.stdout b/testsuite/tests/driver/recomp011/recomp011.stdout
index af92f9392f..d3e0b92508 100644
--- a/testsuite/tests/driver/recomp011/recomp011.stdout
+++ b/testsuite/tests/driver/recomp011/recomp011.stdout
@@ -1,10 +1,10 @@
-[1 of 1] Compiling Main (.hs -> .o)
+[1 of 1] Compiling Main ( Main.hs, Main.o )
Linking Main ...
42
-[1 of 1] Compiling Main (.hs -> .o) [B.hsinc changed]
+[1 of 1] Compiling Main ( Main.hs, Main.o ) [B.hsinc changed]
Linking Main ...
43
-[1 of 1] Compiling Main (.hs -> .o) [A.hsinc changed]
+[1 of 1] Compiling Main ( Main.hs, Main.o ) [A.hsinc changed]
Linking Main ...
4343
4343
diff --git a/testsuite/tests/driver/recomp013/recomp013.stdout b/testsuite/tests/driver/recomp013/recomp013.stdout
index 1aedd741ab..0a5aef7356 100644
--- a/testsuite/tests/driver/recomp013/recomp013.stdout
+++ b/testsuite/tests/driver/recomp013/recomp013.stdout
@@ -1,7 +1,7 @@
first run
-[1 of 3] Compiling A (.hs -> .o)
-[2 of 3] Compiling B (.hs -> .o)
-[3 of 3] Compiling C (.hs -> .o)
+[1 of 3] Compiling A ( A.hs, A.o )
+[2 of 3] Compiling B ( B.hs, B.o )
+[3 of 3] Compiling C ( C.hs, C.o )
second run
-[2 of 3] Compiling B (.hs -> .o)
-[3 of 3] Compiling C (.hs -> .o) [B changed]
+[2 of 3] Compiling B ( B.hs, B.o )
+[3 of 3] Compiling C ( C.hs, C.o ) [B changed]
diff --git a/testsuite/tests/driver/recomp015/recomp015.stdout b/testsuite/tests/driver/recomp015/recomp015.stdout
index c0eff3a3b6..a7dbad203a 100644
--- a/testsuite/tests/driver/recomp015/recomp015.stdout
+++ b/testsuite/tests/driver/recomp015/recomp015.stdout
@@ -1,6 +1,6 @@
-[1 of 1] Compiling Main (.hs -> .o)
+[1 of 1] Compiling Main ( Generate.hs, Generate.o )
Linking Generate ...
-[1 of 1] Compiling Main (.hs -> .o)
+[1 of 1] Compiling Main ( Main.hs, Main.o )
Linking Main ...
Running main...
Running main...
diff --git a/testsuite/tests/driver/recomp016/recomp016.stdout b/testsuite/tests/driver/recomp016/recomp016.stdout
index 2ae49d346a..eb6c6fce42 100644
--- a/testsuite/tests/driver/recomp016/recomp016.stdout
+++ b/testsuite/tests/driver/recomp016/recomp016.stdout
@@ -1,12 +1,12 @@
first run
-[1 of 5] Compiling A (.hs -> .o)
-[2 of 5] Compiling B (.hs -> .o)
-[3 of 5] Compiling C (.hs -> .o)
-[4 of 5] Compiling D (.hs -> .o)
-[5 of 5] Compiling E (.hs -> .o)
+[1 of 5] Compiling A ( A.hs, A.o )
+[2 of 5] Compiling B ( B.hs, B.o )
+[3 of 5] Compiling C ( C.hs, C.o )
+[4 of 5] Compiling D ( D.hs, D.o )
+[5 of 5] Compiling E ( E.hs, E.o )
second run
-[1 of 5] Compiling A2 (.hs -> .o)
-[2 of 5] Compiling B (.hs -> .o)
-[3 of 5] Compiling C (.hs -> .o) [B changed]
-[4 of 5] Compiling D (.hs -> .o) [C changed]
-[5 of 5] Compiling E (.hs -> .o) [B changed]
+[1 of 5] Compiling A2 ( A2.hs, A2.o )
+[2 of 5] Compiling B ( B.hs, B.o )
+[3 of 5] Compiling C ( C.hs, C.o ) [B changed]
+[4 of 5] Compiling D ( D.hs, D.o ) [C changed]
+[5 of 5] Compiling E ( E.hs, E.o ) [B changed]
diff --git a/testsuite/tests/driver/retc001/retc001.stdout b/testsuite/tests/driver/retc001/retc001.stdout
index 65d93d8244..381850d9a4 100644
--- a/testsuite/tests/driver/retc001/retc001.stdout
+++ b/testsuite/tests/driver/retc001/retc001.stdout
@@ -1,7 +1,7 @@
-[1 of 3] Compiling A (.hs -> nothing)
-[2 of 3] Compiling B (.hs -> nothing)
-[3 of 3] Compiling Main (.hs -> nothing)
+[1 of 3] Compiling A ( A.hs, nothing )
+[2 of 3] Compiling B ( B.hs, nothing )
+[3 of 3] Compiling Main ( C.hs, nothing )
Middle
End
-[2 of 3] Compiling B (.hs -> nothing)
-[3 of 3] Compiling Main (.hs -> nothing) [B changed]
+[2 of 3] Compiling B ( B.hs, nothing )
+[3 of 3] Compiling Main ( C.hs, nothing ) [B changed]
diff --git a/testsuite/tests/driver/retc002/retc002.stdout b/testsuite/tests/driver/retc002/retc002.stdout
index 3eed320b17..e76853f8f8 100644
--- a/testsuite/tests/driver/retc002/retc002.stdout
+++ b/testsuite/tests/driver/retc002/retc002.stdout
@@ -1,3 +1,3 @@
-[1 of 3] Compiling W[boot] (.hs-boot -> nothing)
-[2 of 3] Compiling Q (.hs -> nothing)
-[3 of 3] Compiling W (.hs -> nothing)
+[1 of 3] Compiling W[boot] ( W.hs-boot, nothing )
+[2 of 3] Compiling Q ( Q.hs, nothing )
+[3 of 3] Compiling W ( W.hs, nothing )
diff --git a/testsuite/tests/driver/write_interface_make.stdout b/testsuite/tests/driver/write_interface_make.stdout
index 9111e605a2..1594f5ee2f 100644
--- a/testsuite/tests/driver/write_interface_make.stdout
+++ b/testsuite/tests/driver/write_interface_make.stdout
@@ -1 +1 @@
-[1 of 1] Compiling A011 (.hs -> nothing)
+[1 of 1] Compiling A011 ( A011.hs, nothing )