Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/58a5b8bef6b1809b7307961866de811fd1e250a4 >--------------------------------------------------------------- commit 58a5b8bef6b1809b7307961866de811fd1e250a4 Author: David Terei <[email protected]> Date: Tue Feb 14 12:25:05 2012 -0800 Fix up safe haskell test outputs >--------------------------------------------------------------- tests/safeHaskell/ghci/D.hs | 2 +- tests/safeHaskell/ghci/all.T | 1 + tests/safeHaskell/ghci/{p9.stderr => p10.stderr} | 0 tests/safeHaskell/ghci/p10.stdout | 2 -- tests/safeHaskell/ghci/p12.stderr | 3 +++ tests/safeHaskell/ghci/p12.stdout | 2 -- tests/safeHaskell/ghci/p13.stdout | 1 - tests/safeHaskell/ghci/{p3.script => p17.script} | 2 -- tests/safeHaskell/ghci/p17.stderr | 3 +++ tests/safeHaskell/ghci/p3.stderr | 3 +++ tests/safeHaskell/ghci/p3.stdout | 2 -- tests/safeHaskell/ghci/p9.stdout | 1 - 12 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/safeHaskell/ghci/D.hs b/tests/safeHaskell/ghci/D.hs index 3e455fa..2a70c06 100644 --- a/tests/safeHaskell/ghci/D.hs +++ b/tests/safeHaskell/ghci/D.hs @@ -1,4 +1,4 @@ -module D where +module D (a) where a :: Int a = 1 diff --git a/tests/safeHaskell/ghci/all.T b/tests/safeHaskell/ghci/all.T index 4946a3b..1c878c6 100644 --- a/tests/safeHaskell/ghci/all.T +++ b/tests/safeHaskell/ghci/all.T @@ -16,4 +16,5 @@ test('p13', normal, ghci_script, ['p13.script']) test('p14', normal, ghci_script, ['p14.script']) test('p15', normal, ghci_script, ['p15.script']) test('p16', normal, ghci_script, ['p16.script']) +test('p17', normal, ghci_script, ['p17.script']) diff --git a/tests/safeHaskell/ghci/p9.stderr b/tests/safeHaskell/ghci/p10.stderr similarity index 100% copy from tests/safeHaskell/ghci/p9.stderr copy to tests/safeHaskell/ghci/p10.stderr diff --git a/tests/safeHaskell/ghci/p10.stdout b/tests/safeHaskell/ghci/p10.stdout index 2850e01..d00491f 100644 --- a/tests/safeHaskell/ghci/p10.stdout +++ b/tests/safeHaskell/ghci/p10.stdout @@ -1,3 +1 @@ -Warning: can't use * imports with Safe Haskell; ignoring * 1 -2 diff --git a/tests/safeHaskell/ghci/p12.stderr b/tests/safeHaskell/ghci/p12.stderr new file mode 100644 index 0000000..9265dae --- /dev/null +++ b/tests/safeHaskell/ghci/p12.stderr @@ -0,0 +1,3 @@ + +<no location info>: + bytestring-0.9.2.0:Data.ByteString can't be safely imported! The package (bytestring-0.9.2.0) the module resides in isn't trusted. diff --git a/tests/safeHaskell/ghci/p12.stdout b/tests/safeHaskell/ghci/p12.stdout index 95fa91d..5d16ff7 100644 --- a/tests/safeHaskell/ghci/p12.stdout +++ b/tests/safeHaskell/ghci/p12.stdout @@ -1,4 +1,2 @@ don't know how to reverse -XSafe Some flags have not been recognized: -fno-package-trust -*** Exception: bytestring-0.9.2.0:Data.ByteString can't be safely imported! The package (bytestring-0.9.2.0) the module resides in isn't trusted. - diff --git a/tests/safeHaskell/ghci/p13.stdout b/tests/safeHaskell/ghci/p13.stdout index d203d98..e69de29 100644 --- a/tests/safeHaskell/ghci/p13.stdout +++ b/tests/safeHaskell/ghci/p13.stdout @@ -1 +0,0 @@ -Warning: can't use * imports with Safe Haskell; ignoring * diff --git a/tests/safeHaskell/ghci/p3.script b/tests/safeHaskell/ghci/p17.script similarity index 85% copy from tests/safeHaskell/ghci/p3.script copy to tests/safeHaskell/ghci/p17.script index c2d9061..c9821d4 100644 --- a/tests/safeHaskell/ghci/p3.script +++ b/tests/safeHaskell/ghci/p17.script @@ -2,8 +2,6 @@ :unset +s :set -XSafe -import System.IO.Unsafe - -- test trustworthy and package flag import Data.ByteString diff --git a/tests/safeHaskell/ghci/p17.stderr b/tests/safeHaskell/ghci/p17.stderr new file mode 100644 index 0000000..9265dae --- /dev/null +++ b/tests/safeHaskell/ghci/p17.stderr @@ -0,0 +1,3 @@ + +<no location info>: + bytestring-0.9.2.0:Data.ByteString can't be safely imported! The package (bytestring-0.9.2.0) the module resides in isn't trusted. diff --git a/tests/safeHaskell/ghci/p3.stderr b/tests/safeHaskell/ghci/p3.stderr index 55dd279..e0a4eda 100644 --- a/tests/safeHaskell/ghci/p3.stderr +++ b/tests/safeHaskell/ghci/p3.stderr @@ -1,3 +1,6 @@ <no location info>: base:System.IO.Unsafe can't be safely imported! The module itself isn't safe. + +<no location info>: + bytestring-0.9.2.0:Data.ByteString can't be safely imported! The package (bytestring-0.9.2.0) the module resides in isn't trusted. diff --git a/tests/safeHaskell/ghci/p3.stdout b/tests/safeHaskell/ghci/p3.stdout index a415a7e..268f05e 100644 --- a/tests/safeHaskell/ghci/p3.stdout +++ b/tests/safeHaskell/ghci/p3.stdout @@ -1,3 +1 @@ can't import System.IO.Unsafe as it isn't trusted. -*** Exception: bytestring-0.9.2.0:Data.ByteString can't be safely imported! The package (bytestring-0.9.2.0) the module resides in isn't trusted. - diff --git a/tests/safeHaskell/ghci/p9.stdout b/tests/safeHaskell/ghci/p9.stdout index 69acee7..d00491f 100644 --- a/tests/safeHaskell/ghci/p9.stdout +++ b/tests/safeHaskell/ghci/p9.stdout @@ -1,2 +1 @@ -Warning: can't use * imports with Safe Haskell; ignoring * 1 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
