Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/78564a257b822de99913510864ce7a968a1c9eae >--------------------------------------------------------------- commit 78564a257b822de99913510864ce7a968a1c9eae Author: David Terei <[email protected]> Date: Tue Jul 12 12:59:40 2011 -0700 Update safe haskell tests after removal of SafeLanguage >--------------------------------------------------------------- .../safeHaskell/flags/SafeFlags04.stderr | 2 ++ .../safeHaskell/flags/SafeFlags07.stderr | 2 ++ .../safeHaskell/flags/SafeFlags08.stderr | 2 ++ .../safeHaskell/flags/SafeFlags09.stderr | 4 ++-- tests/ghc-regress/safeHaskell/flags/all.T | 14 +++++++++++--- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/tests/ghc-regress/safeHaskell/flags/SafeFlags04.stderr b/tests/ghc-regress/safeHaskell/flags/SafeFlags04.stderr new file mode 100644 index 0000000..2a550f2 --- /dev/null +++ b/tests/ghc-regress/safeHaskell/flags/SafeFlags04.stderr @@ -0,0 +1,2 @@ + +SafeFlags04.hs:1:14: Unsupported extension: SafeLanguage diff --git a/tests/ghc-regress/safeHaskell/flags/SafeFlags07.stderr b/tests/ghc-regress/safeHaskell/flags/SafeFlags07.stderr new file mode 100644 index 0000000..3c3317f --- /dev/null +++ b/tests/ghc-regress/safeHaskell/flags/SafeFlags07.stderr @@ -0,0 +1,2 @@ + +SafeFlags07.hs:1:14: Unsupported extension: SafeLanguage diff --git a/tests/ghc-regress/safeHaskell/flags/SafeFlags08.stderr b/tests/ghc-regress/safeHaskell/flags/SafeFlags08.stderr new file mode 100644 index 0000000..e72e6e4 --- /dev/null +++ b/tests/ghc-regress/safeHaskell/flags/SafeFlags08.stderr @@ -0,0 +1,2 @@ + +SafeFlags08.hs:1:14: Unsupported extension: SafeLanguage diff --git a/tests/ghc-regress/safeHaskell/flags/SafeFlags09.stderr b/tests/ghc-regress/safeHaskell/flags/SafeFlags09.stderr index d4ebb62..2bc5aed 100644 --- a/tests/ghc-regress/safeHaskell/flags/SafeFlags09.stderr +++ b/tests/ghc-regress/safeHaskell/flags/SafeFlags09.stderr @@ -1,2 +1,2 @@ -ghc-stage2: SafeFlags09.hs:1:28-31: Incompatible Safe Haskell flags! (SafeLanguage, Safe) -Usage: For basic information, try the `--help' option. + +SafeFlags09.hs:1:14: Unsupported extension: SafeLanguage diff --git a/tests/ghc-regress/safeHaskell/flags/all.T b/tests/ghc-regress/safeHaskell/flags/all.T index 0d5d538..7848b83 100644 --- a/tests/ghc-regress/safeHaskell/flags/all.T +++ b/tests/ghc-regress/safeHaskell/flags/all.T @@ -7,12 +7,20 @@ setTestOpts(f) test('SafeFlags01', normal, compile, ['-trust base']) test('SafeFlags02', normal, compile, ['']) test('SafeFlags03', normal, compile, ['']) -test('SafeFlags04', normal, compile, ['-trust base']) + +# no longer support a SafeLanguage flag, so expect fail for them. +test('SafeFlags04', normal, compile_fail, ['-trust base']) + test('SafeFlags05', normal, compile, ['-trust base']) test('SafeFlags06', normal, compile, ['']) -test('SafeFlags07', normal, compile, ['-trust base']) -test('SafeFlags08', normal, compile, ['-trust base']) + +# no longer support a SafeLanguage flag, so expect fail for them. +test('SafeFlags07', normal, compile_fail, ['-trust base']) + +# no longer support a SafeLanguage flag, so expect fail for them. +test('SafeFlags08', normal, compile_fail, ['-trust base']) test('SafeFlags09', normal, compile_fail, ['']) + test('SafeFlags10', normal, compile_fail, ['']) test('SafeFlags11', normal, compile, ['-trust base']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
