Fix up safe haskell test outputs

12 files changed, 23 insertions, 9 deletions

diff --git a/testsuite/tests/safeHaskell/ghci/D.hs b/testsuite/tests/safeHaskell/ghci/D.hs
index 3e455fa820..2a70c065ab 100644
--- a/testsuite/tests/safeHaskell/ghci/D.hs
+++ b/testsuite/tests/safeHaskell/ghci/D.hs
@@ -1,4 +1,4 @@
-module D where
+module D (a) where
 
 a :: Int
 a = 1
diff --git a/testsuite/tests/safeHaskell/ghci/all.T b/testsuite/tests/safeHaskell/ghci/all.T
index 4946a3b0c8..1c878c6759 100644
--- a/testsuite/tests/safeHaskell/ghci/all.T
+++ b/testsuite/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/testsuite/tests/safeHaskell/ghci/p10.stderr b/testsuite/tests/safeHaskell/ghci/p10.stderr
new file mode 100644
index 0000000000..768948984e
--- /dev/null
+++ b/testsuite/tests/safeHaskell/ghci/p10.stderr
@@ -0,0 +1,2 @@
+
+<interactive>:10:1: Not in scope: `b'
diff --git a/testsuite/tests/safeHaskell/ghci/p10.stdout b/testsuite/tests/safeHaskell/ghci/p10.stdout
index 2850e0189f..d00491fd7e 100644
--- a/testsuite/tests/safeHaskell/ghci/p10.stdout
+++ b/testsuite/tests/safeHaskell/ghci/p10.stdout
@@ -1,3 +1 @@
-Warning: can't use * imports with Safe Haskell; ignoring *
 1
-2
diff --git a/testsuite/tests/safeHaskell/ghci/p12.stderr b/testsuite/tests/safeHaskell/ghci/p12.stderr
new file mode 100644
index 0000000000..9265daef85
--- /dev/null
+++ b/testsuite/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/testsuite/tests/safeHaskell/ghci/p12.stdout b/testsuite/tests/safeHaskell/ghci/p12.stdout
index 95fa91dbcf..5d16ff7a9f 100644
--- a/testsuite/tests/safeHaskell/ghci/p12.stdout
+++ b/testsuite/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/testsuite/tests/safeHaskell/ghci/p13.stdout b/testsuite/tests/safeHaskell/ghci/p13.stdout
index d203d980bc..e69de29bb2 100644
--- a/testsuite/tests/safeHaskell/ghci/p13.stdout
+++ b/testsuite/tests/safeHaskell/ghci/p13.stdout
@@ -1 +0,0 @@
-Warning: can't use * imports with Safe Haskell; ignoring *
diff --git a/testsuite/tests/safeHaskell/ghci/p17.script b/testsuite/tests/safeHaskell/ghci/p17.script
new file mode 100644
index 0000000000..c9821d4e17
--- /dev/null
+++ b/testsuite/tests/safeHaskell/ghci/p17.script
@@ -0,0 +1,10 @@
+-- Test bad imports
+:unset +s
+:set -XSafe
+
+-- test trustworthy and package flag
+import Data.ByteString
+
+:set -fpackage-trust
+import Data.ByteString
+
diff --git a/testsuite/tests/safeHaskell/ghci/p17.stderr b/testsuite/tests/safeHaskell/ghci/p17.stderr
new file mode 100644
index 0000000000..9265daef85
--- /dev/null
+++ b/testsuite/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/testsuite/tests/safeHaskell/ghci/p3.stderr b/testsuite/tests/safeHaskell/ghci/p3.stderr
index 55dd279187..e0a4eda773 100644
--- a/testsuite/tests/safeHaskell/ghci/p3.stderr
+++ b/testsuite/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/testsuite/tests/safeHaskell/ghci/p3.stdout b/testsuite/tests/safeHaskell/ghci/p3.stdout
index a415a7eefc..268f05e8d9 100644
--- a/testsuite/tests/safeHaskell/ghci/p3.stdout
+++ b/testsuite/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/testsuite/tests/safeHaskell/ghci/p9.stdout b/testsuite/tests/safeHaskell/ghci/p9.stdout
index 69acee76da..d00491fd7e 100644
--- a/testsuite/tests/safeHaskell/ghci/p9.stdout
+++ b/testsuite/tests/safeHaskell/ghci/p9.stdout
@@ -1,2 +1 @@
-Warning: can't use * imports with Safe Haskell; ignoring *
 1