Make default output less verbose (source/object paths)

Reviewers: simonmar, mpickering, austin, bgamari

Reviewed By: bgamari

Subscribers: mpickering, nomeata, thomie

Differential Revision: https://phabricator.haskell.org/D2679

GHC Trac Issues: #12807

37 files changed, 95 insertions, 95 deletions

diff --git a/testsuite/tests/safeHaskell/check/Check01.stderr b/testsuite/tests/safeHaskell/check/Check01.stderr
index f5233f5d5a..095d3b9744 100644
--- a/testsuite/tests/safeHaskell/check/Check01.stderr
+++ b/testsuite/tests/safeHaskell/check/Check01.stderr
@@ -1,4 +1,4 @@
-[3 of 3] Compiling Check01          ( Check01.hs, Check01.o )
+[3 of 3] Compiling Check01         (.hs -> .o)
 
-<no location info>:
+<no location info>: error:
     The package (base-4.9.0.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/Check02.stderr b/testsuite/tests/safeHaskell/check/Check02.stderr
index 708541b8ed..b9183dce45 100644
--- a/testsuite/tests/safeHaskell/check/Check02.stderr
+++ b/testsuite/tests/safeHaskell/check/Check02.stderr
@@ -1 +1 @@
-[3 of 3] Compiling Check02          ( Check02.hs, Check02.o )
+[3 of 3] Compiling Check02         (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/check/Check03.stderr b/testsuite/tests/safeHaskell/check/Check03.stderr
index 343803f6ff..77cf7af90d 100644
--- a/testsuite/tests/safeHaskell/check/Check03.stderr
+++ b/testsuite/tests/safeHaskell/check/Check03.stderr
@@ -1 +1 @@
-[3 of 3] Compiling Check03          ( Check03.hs, Check03.o )
+[3 of 3] Compiling Check03         (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/check/Check04.stderr b/testsuite/tests/safeHaskell/check/Check04.stderr
index ec3bdb1585..9eaed992db 100644
--- a/testsuite/tests/safeHaskell/check/Check04.stderr
+++ b/testsuite/tests/safeHaskell/check/Check04.stderr
@@ -1,2 +1,2 @@
-[4 of 4] Compiling Main             ( Check04.hs, Check04.o )
+[4 of 4] Compiling Main            (.hs -> .o)
 Linking Check04 ...
diff --git a/testsuite/tests/safeHaskell/check/Check06.stderr b/testsuite/tests/safeHaskell/check/Check06.stderr
index 78c2676fc6..fdc7f70fd0 100644
--- a/testsuite/tests/safeHaskell/check/Check06.stderr
+++ b/testsuite/tests/safeHaskell/check/Check06.stderr
@@ -1,5 +1,5 @@
-[1 of 2] Compiling Check06_A        ( Check06_A.hs, Check06_A.o )
-[2 of 2] Compiling Check06          ( Check06.hs, Check06.o )
+[1 of 2] Compiling Check06_A       (.hs -> .o)
+[2 of 2] Compiling Check06         (.hs -> .o)
 
-<no location info>:
+<no location info>: error:
     The package (base-4.9.0.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/Check07.stderr b/testsuite/tests/safeHaskell/check/Check07.stderr
index f41fbe0bde..1c08775f9f 100644
--- a/testsuite/tests/safeHaskell/check/Check07.stderr
+++ b/testsuite/tests/safeHaskell/check/Check07.stderr
@@ -1,3 +1,3 @@
-[1 of 3] Compiling Check07_A        ( Check07_A.hs, Check07_A.o )
-[2 of 3] Compiling Check07_B        ( Check07_B.hs, Check07_B.o )
-[3 of 3] Compiling Check07          ( Check07.hs, Check07.o )
+[1 of 3] Compiling Check07_A       (.hs -> .o)
+[2 of 3] Compiling Check07_B       (.hs -> .o)
+[3 of 3] Compiling Check07         (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/check/Check08.stderr b/testsuite/tests/safeHaskell/check/Check08.stderr
index e081a984e8..e901f6baeb 100644
--- a/testsuite/tests/safeHaskell/check/Check08.stderr
+++ b/testsuite/tests/safeHaskell/check/Check08.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling Check08_A        ( Check08_A.hs, Check08_A.o )
-[2 of 3] Compiling Check08_B        ( Check08_B.hs, Check08_B.o )
-[3 of 3] Compiling Check08          ( Check08.hs, Check08.o )
+[1 of 3] Compiling Check08_A       (.hs -> .o)
+[2 of 3] Compiling Check08_B       (.hs -> .o)
+[3 of 3] Compiling Check08         (.hs -> .o)
 
 <no location info>: error:
     The package (base-4.9.0.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/CheckB.stderr b/testsuite/tests/safeHaskell/check/CheckB.stderr
index f8321b3704..8df711d1fc 100644
--- a/testsuite/tests/safeHaskell/check/CheckB.stderr
+++ b/testsuite/tests/safeHaskell/check/CheckB.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling CheckB_Aux       ( CheckB_Aux.hs, CheckB_Aux.o )
-[2 of 2] Compiling CheckB           ( CheckB.hs, CheckB.o )
+[1 of 2] Compiling CheckB_Aux      (.hs -> .o)
+[2 of 2] Compiling CheckB          (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
index cc3588f9c0..cdd36a70c3 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
@@ -1,4 +1,4 @@
-[2 of 2] Compiling Main             ( ImpSafe03.hs, ImpSafe03.o )
+[2 of 2] Compiling Main            (.hs -> .o)
 
-<no location info>:
-    The package (bytestring-0.10.8.0) is required to be trusted but it isn't!
+<no location info>: error:
+    The package (bytestring-0.10.8.1) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr
index 20349c6024..a3e41c28cc 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SH_Overlap1_B    ( SH_Overlap1_B.hs, SH_Overlap1_B.o )
-[2 of 3] Compiling SH_Overlap1_A    ( SH_Overlap1_A.hs, SH_Overlap1_A.o )
-[3 of 3] Compiling SH_Overlap1      ( SH_Overlap1.hs, SH_Overlap1.o )
+[1 of 3] Compiling SH_Overlap1_B   (.hs -> .o)
+[2 of 3] Compiling SH_Overlap1_A   (.hs -> .o)
+[3 of 3] Compiling SH_Overlap1     (.hs -> .o)
 
 SH_Overlap1.hs:15:8: error:
     Unsafe overlapping instances for C [Int] arising from a use of ‘f’
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap10.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap10.stderr
index c5aee56283..7d3ccae40b 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap10.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap10.stderr
@@ -1,3 +1,3 @@
-[1 of 3] Compiling SH_Overlap10_B   ( SH_Overlap10_B.hs, SH_Overlap10_B.o )
-[2 of 3] Compiling SH_Overlap10_A   ( SH_Overlap10_A.hs, SH_Overlap10_A.o )
-[3 of 3] Compiling SH_Overlap10     ( SH_Overlap10.hs, SH_Overlap10.o )
+[1 of 3] Compiling SH_Overlap10_B  (.hs -> .o)
+[2 of 3] Compiling SH_Overlap10_A  (.hs -> .o)
+[3 of 3] Compiling SH_Overlap10    (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr
index aca02ef4a9..e5bf0bc9df 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SH_Overlap11_B   ( SH_Overlap11_B.hs, SH_Overlap11_B.o )
-[2 of 3] Compiling SH_Overlap11_A   ( SH_Overlap11_A.hs, SH_Overlap11_A.o )
-[3 of 3] Compiling SH_Overlap11     ( SH_Overlap11.hs, SH_Overlap11.o )
+[1 of 3] Compiling SH_Overlap11_B  (.hs -> .o)
+[2 of 3] Compiling SH_Overlap11_A  (.hs -> .o)
+[3 of 3] Compiling SH_Overlap11    (.hs -> .o)
 
 SH_Overlap11.hs:1:16: warning: [-Wunsafe]
     ‘SH_Overlap11’ has been inferred as unsafe!
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr
index b4f15515b0..4aea8351a6 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SH_Overlap2_B    ( SH_Overlap2_B.hs, SH_Overlap2_B.o )
-[2 of 3] Compiling SH_Overlap2_A    ( SH_Overlap2_A.hs, SH_Overlap2_A.o )
-[3 of 3] Compiling SH_Overlap2      ( SH_Overlap2.hs, SH_Overlap2.o )
+[1 of 3] Compiling SH_Overlap2_B   (.hs -> .o)
+[2 of 3] Compiling SH_Overlap2_A   (.hs -> .o)
+[3 of 3] Compiling SH_Overlap2     (.hs -> .o)
 
 SH_Overlap2.hs:18:8: error:
     Unsafe overlapping instances for C [Int] arising from a use of ‘f’
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap3.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap3.stderr
index 8a0066f55e..8eccbc0cdf 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap3.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap3.stderr
@@ -1,3 +1,3 @@
-[1 of 3] Compiling SH_Overlap3_B    ( SH_Overlap3_B.hs, SH_Overlap3_B.o )
-[2 of 3] Compiling SH_Overlap3_A    ( SH_Overlap3_A.hs, SH_Overlap3_A.o )
-[3 of 3] Compiling SH_Overlap3      ( SH_Overlap3.hs, SH_Overlap3.o )
+[1 of 3] Compiling SH_Overlap3_B   (.hs -> .o)
+[2 of 3] Compiling SH_Overlap3_A   (.hs -> .o)
+[3 of 3] Compiling SH_Overlap3     (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap4.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap4.stderr
index 6942269b85..5f9fb1c057 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap4.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap4.stderr
@@ -1,3 +1,3 @@
-[1 of 3] Compiling SH_Overlap4_B    ( SH_Overlap4_B.hs, SH_Overlap4_B.o )
-[2 of 3] Compiling SH_Overlap4_A    ( SH_Overlap4_A.hs, SH_Overlap4_A.o )
-[3 of 3] Compiling SH_Overlap4      ( SH_Overlap4.hs, SH_Overlap4.o )
+[1 of 3] Compiling SH_Overlap4_B   (.hs -> .o)
+[2 of 3] Compiling SH_Overlap4_A   (.hs -> .o)
+[3 of 3] Compiling SH_Overlap4     (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr
index 8c2bc7df9d..97d7c76aa0 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SH_Overlap5_B    ( SH_Overlap5_B.hs, SH_Overlap5_B.o )
-[2 of 3] Compiling SH_Overlap5_A    ( SH_Overlap5_A.hs, SH_Overlap5_A.o )
-[3 of 3] Compiling SH_Overlap5      ( SH_Overlap5.hs, SH_Overlap5.o )
+[1 of 3] Compiling SH_Overlap5_B   (.hs -> .o)
+[2 of 3] Compiling SH_Overlap5_A   (.hs -> .o)
+[3 of 3] Compiling SH_Overlap5     (.hs -> .o)
 
 SH_Overlap5.hs:15:8: error:
     Unsafe overlapping instances for C [Int] arising from a use of ‘f’
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr
index e5b7ac95d6..a2ca4a70e1 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SH_Overlap6_B    ( SH_Overlap6_B.hs, SH_Overlap6_B.o )
-[2 of 3] Compiling SH_Overlap6_A    ( SH_Overlap6_A.hs, SH_Overlap6_A.o )
-[3 of 3] Compiling SH_Overlap6      ( SH_Overlap6.hs, SH_Overlap6.o )
+[1 of 3] Compiling SH_Overlap6_B   (.hs -> .o)
+[2 of 3] Compiling SH_Overlap6_A   (.hs -> .o)
+[3 of 3] Compiling SH_Overlap6     (.hs -> .o)
 
 SH_Overlap6.hs:14:8: error:
     Unsafe overlapping instances for C [Int] arising from a use of ‘f’
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr
index 8010407cc7..717f129dff 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SH_Overlap7_B    ( SH_Overlap7_B.hs, SH_Overlap7_B.o )
-[2 of 3] Compiling SH_Overlap7_A    ( SH_Overlap7_A.hs, SH_Overlap7_A.o )
-[3 of 3] Compiling SH_Overlap7      ( SH_Overlap7.hs, SH_Overlap7.o )
+[1 of 3] Compiling SH_Overlap7_B   (.hs -> .o)
+[2 of 3] Compiling SH_Overlap7_A   (.hs -> .o)
+[3 of 3] Compiling SH_Overlap7     (.hs -> .o)
 
 SH_Overlap7.hs:1:16: warning: [-Wunsafe]
     ‘SH_Overlap7’ has been inferred as unsafe!
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.stderr
index f53cd439bb..b3c0197104 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling SH_Overlap8_A    ( SH_Overlap8_A.hs, SH_Overlap8_A.o )
-[2 of 2] Compiling SH_Overlap8      ( SH_Overlap8.hs, SH_Overlap8.o )
+[1 of 2] Compiling SH_Overlap8_A   (.hs -> .o)
+[2 of 2] Compiling SH_Overlap8     (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap9.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap9.stderr
index b94705c654..6b09a7fa6b 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap9.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap9.stderr
@@ -1,3 +1,3 @@
-[1 of 3] Compiling SH_Overlap9_B    ( SH_Overlap9_B.hs, SH_Overlap9_B.o )
-[2 of 3] Compiling SH_Overlap9_A    ( SH_Overlap9_A.hs, SH_Overlap9_A.o )
-[3 of 3] Compiling SH_Overlap9      ( SH_Overlap9.hs, SH_Overlap9.o )
+[1 of 3] Compiling SH_Overlap9_B   (.hs -> .o)
+[2 of 3] Compiling SH_Overlap9_A   (.hs -> .o)
+[3 of 3] Compiling SH_Overlap9     (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr
index 134cbbe20b..a8324e047c 100644
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling SafeInfered01_A  ( SafeInfered01_A.hs, SafeInfered01_A.o )
-[2 of 2] Compiling SafeInfered01    ( SafeInfered01.hs, SafeInfered01.o )
+[1 of 2] Compiling SafeInfered01_A (.hs -> .o)
+[2 of 2] Compiling SafeInfered01   (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr
index ffbce376b1..4954b70cdc 100644
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling SafeInfered02_A  ( SafeInfered02_A.hs, SafeInfered02_A.o )
-[2 of 2] Compiling SafeInfered02    ( SafeInfered02.hs, SafeInfered02.o )
+[1 of 2] Compiling SafeInfered02_A (.hs -> .o)
+[2 of 2] Compiling SafeInfered02   (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr
index 18940a98f2..3109ec0b71 100644
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling SafeInfered03_A  ( SafeInfered03_A.hs, SafeInfered03_A.o )
-[2 of 2] Compiling SafeInfered03    ( SafeInfered03.hs, SafeInfered03.o )
+[1 of 2] Compiling SafeInfered03_A (.hs -> .o)
+[2 of 2] Compiling SafeInfered03   (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr
index c264464886..8a394f43b6 100644
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling SafeInfered04_A  ( SafeInfered04_A.hs, SafeInfered04_A.o )
-[2 of 2] Compiling SafeInfered04    ( SafeInfered04.hs, SafeInfered04.o )
+[1 of 2] Compiling SafeInfered04_A (.hs -> .o)
+[2 of 2] Compiling SafeInfered04   (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr
index 5d194064b8..8c9e264273 100644
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr
@@ -1,8 +1,8 @@
 
 SafeInfered05.hs:2:14: warning:
     -XOverlappingInstances is deprecated: instead use per-instance pragmas OVERLAPPING/OVERLAPPABLE/OVERLAPS
-[1 of 2] Compiling SafeInfered05_A  ( SafeInfered05_A.hs, SafeInfered05_A.o )
+[1 of 2] Compiling SafeInfered05_A (.hs -> .o)
 
 SafeInfered05_A.hs:2:16: warning: [-Wsafe]
     ‘SafeInfered05_A’ has been inferred as safe!
-[2 of 2] Compiling SafeInfered05    ( SafeInfered05.hs, SafeInfered05.o )
+[2 of 2] Compiling SafeInfered05   (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
index f96f1719ae..dc2be49840 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
@@ -1,6 +1,6 @@
-[1 of 2] Compiling UnsafeInfered01_A ( UnsafeInfered01_A.hs, UnsafeInfered01_A.o )
-[2 of 2] Compiling UnsafeInfered01  ( UnsafeInfered01.hs, UnsafeInfered01.o )
+[1 of 2] Compiling UnsafeInfered01_A (.hs -> .o)
+[2 of 2] Compiling UnsafeInfered01  (.hs -> .o)
 
-UnsafeInfered01.hs:4:1:
+UnsafeInfered01.hs:4:1: error:
     UnsafeInfered01_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
index 7bd9a17733..12e6ad3e8b 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
@@ -1,6 +1,6 @@
-[1 of 2] Compiling UnsafeInfered02_A ( UnsafeInfered02_A.hs, UnsafeInfered02_A.o )
-[2 of 2] Compiling UnsafeInfered02  ( UnsafeInfered02.hs, UnsafeInfered02.o )
+[1 of 2] Compiling UnsafeInfered02_A (.hs -> .o)
+[2 of 2] Compiling UnsafeInfered02  (.hs -> .o)
 
-UnsafeInfered02.hs:4:1:
+UnsafeInfered02.hs:4:1: error:
     UnsafeInfered02_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
index ea21c40d48..8d28f8a64e 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
@@ -1,6 +1,6 @@
-[1 of 2] Compiling UnsafeInfered03_A ( UnsafeInfered03_A.hs, UnsafeInfered03_A.o )
-[2 of 2] Compiling UnsafeInfered03  ( UnsafeInfered03.hs, UnsafeInfered03.o )
+[1 of 2] Compiling UnsafeInfered03_A (.hs -> .o)
+[2 of 2] Compiling UnsafeInfered03  (.hs -> .o)
 
-UnsafeInfered03.hs:4:1:
+UnsafeInfered03.hs:4:1: error:
     UnsafeInfered03_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
index 2b23ce076f..354d026927 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
@@ -1,6 +1,6 @@
-[1 of 2] Compiling UnsafeInfered05_A ( UnsafeInfered05_A.hs, UnsafeInfered05_A.o )
-[2 of 2] Compiling UnsafeInfered05  ( UnsafeInfered05.hs, UnsafeInfered05.o )
+[1 of 2] Compiling UnsafeInfered05_A (.hs -> .o)
+[2 of 2] Compiling UnsafeInfered05  (.hs -> .o)
 
-UnsafeInfered05.hs:4:1:
+UnsafeInfered05.hs:4:1: error:
     UnsafeInfered05_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
index 73c182535c..738feecf94 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
@@ -1,6 +1,6 @@
-[1 of 2] Compiling UnsafeInfered06_A ( UnsafeInfered06_A.hs, UnsafeInfered06_A.o )
-[2 of 2] Compiling UnsafeInfered06  ( UnsafeInfered06.hs, UnsafeInfered06.o )
+[1 of 2] Compiling UnsafeInfered06_A (.hs -> .o)
+[2 of 2] Compiling UnsafeInfered06  (.hs -> .o)
 
-UnsafeInfered06.hs:4:1:
+UnsafeInfered06.hs:4:1: error:
     UnsafeInfered06_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr
index 36f4ded2d5..5590e28c82 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling UnsafeInfered08_A ( UnsafeInfered08_A.hs, UnsafeInfered08_A.o )
-[2 of 2] Compiling UnsafeInfered08  ( UnsafeInfered08.hs, UnsafeInfered08.o )
+[1 of 2] Compiling UnsafeInfered08_A (.hs -> .o)
+[2 of 2] Compiling UnsafeInfered08  (.hs -> .o)
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
index 42082c854e..4c1cfba83d 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
@@ -1,7 +1,7 @@
-[1 of 3] Compiling UnsafeInfered09_B ( UnsafeInfered09_B.hs, UnsafeInfered09_B.o )
-[2 of 3] Compiling UnsafeInfered09_A ( UnsafeInfered09_A.hs, UnsafeInfered09_A.o )
-[3 of 3] Compiling UnsafeInfered09  ( UnsafeInfered09.hs, UnsafeInfered09.o )
+[1 of 3] Compiling UnsafeInfered09_B (.hs -> .o)
+[2 of 3] Compiling UnsafeInfered09_A (.hs -> .o)
+[3 of 3] Compiling UnsafeInfered09  (.hs -> .o)
 
-UnsafeInfered09.hs:4:1:
+UnsafeInfered09.hs:4:1: error:
     UnsafeInfered09_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
index c67b891952..1402ed426f 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
@@ -1,6 +1,6 @@
-[1 of 2] Compiling UnsafeInfered10_A ( UnsafeInfered10_A.hs, UnsafeInfered10_A.o )
-[2 of 2] Compiling UnsafeInfered10  ( UnsafeInfered10.hs, UnsafeInfered10.o )
+[1 of 2] Compiling UnsafeInfered10_A (.hs -> .o)
+[2 of 2] Compiling UnsafeInfered10  (.hs -> .o)
 
-UnsafeInfered10.hs:5:1:
+UnsafeInfered10.hs:5:1: error:
     UnsafeInfered10_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
index 18a6a459c7..98d3c495ed 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
@@ -1,4 +1,4 @@
-[1 of 2] Compiling UnsafeInfered11_A ( UnsafeInfered11_A.hs, UnsafeInfered11_A.o )
+[1 of 2] Compiling UnsafeInfered11_A (.hs -> .o)
 
 UnsafeInfered11_A.hs:1:16: warning: [-Wunsafe]
     ‘UnsafeInfered11_A’ has been inferred as unsafe!
@@ -6,7 +6,7 @@ UnsafeInfered11_A.hs:1:16: warning: [-Wunsafe]
         UnsafeInfered11_A.hs:17:11: warning:
             Rule "lookupx/T" ignored
             User defined rules are disabled under Safe Haskell
-[2 of 2] Compiling UnsafeInfered11  ( UnsafeInfered11.hs, UnsafeInfered11.o )
+[2 of 2] Compiling UnsafeInfered11  (.hs -> .o)
 
 UnsafeInfered11.hs:5:1: error:
     UnsafeInfered11_A: Can't be safely imported!
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
index d0c5c68d6a..32abdd46c0 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SafeLang10_A     ( SafeLang10_A.hs, SafeLang10_A.o )
-[2 of 3] Compiling SafeLang10_B     ( SafeLang10_B.hs, SafeLang10_B.o )
-[3 of 3] Compiling Main             ( SafeLang10.hs, SafeLang10.o )
+[1 of 3] Compiling SafeLang10_A    (.hs -> .o)
+[2 of 3] Compiling SafeLang10_B    (.hs -> .o)
+[3 of 3] Compiling Main            (.hs -> .o)
 
 SafeLang10.hs:8:13:
     Unsafe overlapping instances for Pos [Int]
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
index b23875bf1d..33d7e346da 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
@@ -4,8 +4,8 @@ SafeLang12.hs:2:14: warning:
 
 SafeLang12_B.hs:2:14: warning:
     -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell
-[1 of 3] Compiling SafeLang12_A     ( SafeLang12_A.hs, SafeLang12_A.o )
-[2 of 3] Compiling SafeLang12_B     ( SafeLang12_B.hs, SafeLang12_B.o )
+[1 of 3] Compiling SafeLang12_A    (.hs -> .o)
+[2 of 3] Compiling SafeLang12_B    (.hs -> .o)
 
 SafeLang12_B.hs:5:1: error:
     Language.Haskell.TH: Can't be safely imported!
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr
index c59f86670a..4665f62a64 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SafeLang17_A     ( SafeLang17_A.hs, SafeLang17_A.o )
-[2 of 3] Compiling SafeLang17_B     ( SafeLang17_B.hs, SafeLang17_B.o )
-[3 of 3] Compiling Main             ( SafeLang17.hs, SafeLang17.o )
+[1 of 3] Compiling SafeLang17_A    (.hs -> .o)
+[2 of 3] Compiling SafeLang17_B    (.hs -> .o)
+[3 of 3] Compiling Main            (.hs -> .o)
 
 SafeLang17.hs:8:13:
     Unsafe overlapping instances for Pos [Int]