Fix some more race issues with safe tests.

7 files changed, 17 insertions, 9 deletions

diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs
index 5817e54095..5f1e51c956 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 module Main where
 
-import SafeLang11_A
+import SafeLang12_A
 import SafeLang12_B
 
 $(mkSimpleClass ''A)
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
index 1466921b07..e4f7854a50 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
@@ -4,8 +4,7 @@ SafeLang12.hs:2:14:
 
 SafeLang12_B.hs:2:14:
     Warning: XTemplateHaskell is not allowed in Safe Haskell; ignoring XTemplateHaskell
+[1 of 3] Compiling SafeLang12_B     ( SafeLang12_B.hs, SafeLang12_B.o )
 
-SafeLang12_B.hs:3:8:
-    File name does not match module name:
-    Saw: `SafeLang11_B'
-    Expected: `SafeLang12_B'
+SafeLang12_B.hs:14:68:
+    lexical error in string/character literal at character '\''
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_A.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_A.hs
new file mode 100644
index 0000000000..3122859b59
--- /dev/null
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_A.hs
@@ -0,0 +1,9 @@
+{-# LANGUAGE Safe #-}
+module SafeLang12_A ( A ) where
+
+data A = A1 | A2
+
+instance Show A where
+    show A1 = "A1 is secret!"
+    show A2 = "A2 is secret!"
+
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs
index f6ce559448..e8269c129d 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE Safe #-}
 {-# LANGUAGE TemplateHaskell #-}
-module SafeLang11_B ( Class(..), mkSimpleClass ) where
+module SafeLang12_B ( Class(..), mkSimpleClass ) where
 
 import Language.Haskell.TH
 
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.hs
index 9be68a3abb..59e8386ac1 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.hs
@@ -4,7 +4,7 @@
 -- should disallow. SafeLang14 will do that.
 module Main where
 
-import SafeLang13_A
+import SafeLang14_A
 import Data.Typeable
 
 data H = H String deriving (Typeable, Show)
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.stderr
index 5430d9154f..af8dca390d 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.stderr
@@ -1,4 +1,4 @@
-[1 of 2] Compiling SafeLang13_A     ( SafeLang13_A.hs, SafeLang13_A.o )
+[1 of 2] Compiling SafeLang14_A     ( SafeLang14_A.hs, SafeLang14_A.o )
 [2 of 2] Compiling Main             ( SafeLang14.hs, SafeLang14.o )
 
 SafeLang14.hs:14:10:
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang14_A.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang14_A.hs
index c49b085502..d357db9107 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang14_A.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang14_A.hs
@@ -1,4 +1,4 @@
-module SafeLang13_A (IsoInt, h, showH, P, p, showP) where
+module SafeLang14_A (IsoInt, h, showH, P, p, showP) where
 
 newtype IsoInt = I Int