Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a3e11874a42c82e56faec141a53748bd4beae61c >--------------------------------------------------------------- commit a3e11874a42c82e56faec141a53748bd4beae61c Author: David Terei <[email protected]> Date: Tue Dec 20 00:57:03 2011 -0800 Update Safe Haskell tests >--------------------------------------------------------------- tests/safeHaskell/check/Check01.hs | 2 +- tests/safeHaskell/check/Check05.hs | 7 +++++++ tests/safeHaskell/check/Check05.stderr | 3 +++ tests/safeHaskell/check/all.T | 3 +++ tests/safeHaskell/flags/SafeFlags18.stderr | 6 ++++++ tests/safeHaskell/flags/all.T | 2 +- 6 files changed, 21 insertions(+), 2 deletions(-) diff --git a/tests/safeHaskell/check/Check01.hs b/tests/safeHaskell/check/Check01.hs index f11d87d..1d5df58 100644 --- a/tests/safeHaskell/check/Check01.hs +++ b/tests/safeHaskell/check/Check01.hs @@ -1,4 +1,4 @@ -{-# GHC_OPTIONS -fpackage-trust #-} +{-# OPTIONS_GHC -fpackage-trust #-} {-# LANGUAGE Unsafe #-} module Check01 ( main' ) where diff --git a/tests/safeHaskell/check/Check05.hs b/tests/safeHaskell/check/Check05.hs new file mode 100644 index 0000000..2c3512a --- /dev/null +++ b/tests/safeHaskell/check/Check05.hs @@ -0,0 +1,7 @@ +{-# OPTIONS_GHC -fpackage-trust #-} +module Check05 ( main' ) where + +main' = do + let n = 1 + print $ n + diff --git a/tests/safeHaskell/check/Check05.stderr b/tests/safeHaskell/check/Check05.stderr new file mode 100644 index 0000000..9db0875 --- /dev/null +++ b/tests/safeHaskell/check/Check05.stderr @@ -0,0 +1,3 @@ + +Check05.hs:1:16: + Warning: -fpackage-trust ignored; must be specified with a Safe Haskell flag diff --git a/tests/safeHaskell/check/all.T b/tests/safeHaskell/check/all.T index d665c65..d8b2f37 100644 --- a/tests/safeHaskell/check/all.T +++ b/tests/safeHaskell/check/all.T @@ -39,3 +39,6 @@ test('Check04', normal, multi_compile, ['Check04', [ ('Check04_1.hs', '-trust base') ], '-fpackage-trust']) +# Check -fpackage-trust with no safe haskell flag is an error +test('Check05', normal, compile, ['']) + diff --git a/tests/safeHaskell/flags/SafeFlags18.stderr b/tests/safeHaskell/flags/SafeFlags18.stderr new file mode 100644 index 0000000..7ef8338 --- /dev/null +++ b/tests/safeHaskell/flags/SafeFlags18.stderr @@ -0,0 +1,6 @@ + +SafeFlags18.hs:1:16: + Warning: -fpackage-trust ignored; must be specified with a Safe Haskell flag + +<no location info>: +Failing due to -Werror. diff --git a/tests/safeHaskell/flags/all.T b/tests/safeHaskell/flags/all.T index f5e9a89..9269f8b 100644 --- a/tests/safeHaskell/flags/all.T +++ b/tests/safeHaskell/flags/all.T @@ -37,7 +37,7 @@ test('SafeFlags14', normal, compile_fail, ['']) test('SafeFlags15', normal, compile, ['']) test('SafeFlags16', normal, compile, ['']) test('SafeFlags17', normal, compile_fail, ['-distrust base']) -test('SafeFlags18', normal, compile, ['-trust base']) +test('SafeFlags18', normal, compile_fail, ['-trust base -Werror']) test('SafeFlags19', normal, compile_fail, ['']) test('SafeFlags20', normal, compile, ['-trust base']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
