diff options
author | David Terei <davidterei@gmail.com> | 2011-10-17 14:14:02 -0700 |
---|---|---|
committer | David Terei <davidterei@gmail.com> | 2011-10-17 17:04:10 -0700 |
commit | 29caf2acdd47ab68f460f2408c025bdc8379f36f (patch) | |
tree | 2bd37caacccfbdc2e98a278a0d67d5ec0a8f6e16 /testsuite/tests/safeHaskell | |
parent | 2957cfc0446dde30e6f17d17c721048d70982831 (diff) | |
download | haskell-29caf2acdd47ab68f460f2408c025bdc8379f36f.tar.gz |
update tests for safe haskell changes
Diffstat (limited to 'testsuite/tests/safeHaskell')
8 files changed, 20 insertions, 5 deletions
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang01.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang01.stderr index 18320eb727..88b5e05ab3 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang01.stderr +++ b/testsuite/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/testsuite/tests/safeHaskell/safeLanguage/SafeLang02.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang02.stderr index 6e3546968b..069e5be4e9 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang02.stderr +++ b/testsuite/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/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr index 1218b29a6d..cb081b0ebe 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr +++ b/testsuite/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/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr index e4f7854a50..03c4d1abe8 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr +++ b/testsuite/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/testsuite/tests/safeHaskell/safeLanguage/SafeLang16.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang16.hs new file mode 100644 index 0000000000..78708da6ac --- /dev/null +++ b/testsuite/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/testsuite/tests/safeHaskell/safeLanguage/SafeLang16.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang16.stderr new file mode 100644 index 0000000000..e15b20bb18 --- /dev/null +++ b/testsuite/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/testsuite/tests/safeHaskell/safeLanguage/SafeLang16.stdout b/testsuite/tests/safeHaskell/safeLanguage/SafeLang16.stdout new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang16.stdout diff --git a/testsuite/tests/safeHaskell/safeLanguage/all.T b/testsuite/tests/safeHaskell/safeLanguage/all.T index e48484fd6c..89972e7d1d 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/all.T +++ b/testsuite/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, ['']) |