[commit: testsuite] master: update tests for safe haskell changes (47f0d9a)

[David Terei]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/47f0d9ac4b8fe9084c3e7f9233690a4b7b1013b9

>---------------------------------------------------------------

commit 47f0d9ac4b8fe9084c3e7f9233690a4b7b1013b9
Author: David Terei <davidterei at gmail.com>
Date:   Mon Oct 17 14:14:02 2011 -0700

    update tests for safe haskell changes

>---------------------------------------------------------------

 tests/driver/T4437.hs                              |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang01.stderr   |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang02.stderr   |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang07.stderr   |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang12.stderr   |    4 ++--
 tests/safeHaskell/safeLanguage/SafeLang16.hs       |   11 +++++++++++
 tests/safeHaskell/safeLanguage/SafeLang16.stderr   |    3 +++
 .../safeLanguage/SafeLang16.stdout}                |    0 
 tests/safeHaskell/safeLanguage/all.T               |    1 +
 9 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/tests/driver/T4437.hs b/tests/driver/T4437.hs
index f237cd2..d1b12aa 100644
--- a/tests/driver/T4437.hs
+++ b/tests/driver/T4437.hs
@@ -8,7 +8,7 @@ import Language.Haskell.Extension
 
 main :: IO ()
 main = do
-    let ghcExtensions = [ ext | (ext, _, _, _) <- xFlags ]
+    let ghcExtensions = [ ext | (ext, _, _) <- xFlags ]
         cabalExtensions = map show [ toEnum 0 :: KnownExtension .. ]
         ghcOnlyExtensions = ghcExtensions \\ cabalExtensions
         cabalOnlyExtensions = cabalExtensions \\ ghcExtensions
diff --git a/tests/safeHaskell/safeLanguage/SafeLang01.stderr b/tests/safeHaskell/safeLanguage/SafeLang01.stderr
index 18320eb..88b5e05 100644
--- a/tests/safeHaskell/safeLanguage/SafeLang01.stderr
+++ b/tests/safeHaskell/safeLanguage/SafeLang01.stderr
@@ -1,3 +1,3 @@
 
 SafeLang01.hs:1:20:
-    Warning: XTemplateHaskell is not allowed in Safe Haskell; ignoring XTemplateHaskell
+    Warning: -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell
diff --git a/tests/safeHaskell/safeLanguage/SafeLang02.stderr b/tests/safeHaskell/safeLanguage/SafeLang02.stderr
index 6e35469..069e5be 100644
--- a/tests/safeHaskell/safeLanguage/SafeLang02.stderr
+++ b/tests/safeHaskell/safeLanguage/SafeLang02.stderr
@@ -1,3 +1,3 @@
 
-<no location info>:
+SafeLang02.hs:1:20:
     Warning: -XGeneralizedNewtypeDeriving is not allowed in Safe Haskell; ignoring -XGeneralizedNewtypeDeriving
diff --git a/tests/safeHaskell/safeLanguage/SafeLang07.stderr b/tests/safeHaskell/safeLanguage/SafeLang07.stderr
index 1218b29..cb081b0 100644
--- a/tests/safeHaskell/safeLanguage/SafeLang07.stderr
+++ b/tests/safeHaskell/safeLanguage/SafeLang07.stderr
@@ -1,5 +1,5 @@
 
-<no location info>:
+SafeLang07.hs:2:14:
     Warning: -XGeneralizedNewtypeDeriving is not allowed in Safe Haskell; ignoring -XGeneralizedNewtypeDeriving
 
 SafeLang07.hs:15:1:
diff --git a/tests/safeHaskell/safeLanguage/SafeLang12.stderr b/tests/safeHaskell/safeLanguage/SafeLang12.stderr
index e4f7854..03c4d1a 100644
--- a/tests/safeHaskell/safeLanguage/SafeLang12.stderr
+++ b/tests/safeHaskell/safeLanguage/SafeLang12.stderr
@@ -1,9 +1,9 @@
 
 SafeLang12.hs:2:14:
-    Warning: XTemplateHaskell is not allowed in Safe Haskell; ignoring XTemplateHaskell
+    Warning: -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell
 
 SafeLang12_B.hs:2:14:
-    Warning: XTemplateHaskell is not allowed in Safe Haskell; ignoring XTemplateHaskell
+    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:14:68:
diff --git a/tests/safeHaskell/safeLanguage/SafeLang16.hs b/tests/safeHaskell/safeLanguage/SafeLang16.hs
new file mode 100644
index 0000000..78708da
--- /dev/null
+++ b/tests/safeHaskell/safeLanguage/SafeLang16.hs
@@ -0,0 +1,11 @@
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE Safe #-}
+
+-- | Test SafeLanguage disables things
+-- Testing ordering doesn't matter this time
+-- with Safe appearing after TH.
+module SafeLang16 where
+
+f :: Int
+f = 1
+
diff --git a/tests/safeHaskell/safeLanguage/SafeLang16.stderr b/tests/safeHaskell/safeLanguage/SafeLang16.stderr
new file mode 100644
index 0000000..e15b20b
--- /dev/null
+++ b/tests/safeHaskell/safeLanguage/SafeLang16.stderr
@@ -0,0 +1,3 @@
+
+SafeLang16.hs:1:14:
+    Warning: -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell
diff --git a/tests/annotations/should_compile/ann01.stderr b/tests/safeHaskell/safeLanguage/SafeLang16.stdout
similarity index 100%
copy from tests/annotations/should_compile/ann01.stderr
copy to tests/safeHaskell/safeLanguage/SafeLang16.stdout
diff --git a/tests/safeHaskell/safeLanguage/all.T b/tests/safeHaskell/safeLanguage/all.T
index e48484f..89972e7 100644
--- a/tests/safeHaskell/safeLanguage/all.T
+++ b/tests/safeHaskell/safeLanguage/all.T
@@ -46,3 +46,4 @@ test('SafeLang15',
       extra_clean(['SafeLang15_A.o', 'SafeLang15_A.hi'])],
      multimod_compile_and_run,
      ['SafeLang15', '-trust base -XSafe'])
+test('SafeLang16', normal, compile, [''])