Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1e3841d1c2f52773f61f083bd35175a94f904052

>---------------------------------------------------------------

commit 1e3841d1c2f52773f61f083bd35175a94f904052
Author: David Terei <[email protected]>
Date:   Mon Aug 13 17:25:39 2012 -0700

    Update old safehaskell test

>---------------------------------------------------------------

 tests/safeHaskell/ghci/p2.script |    4 +++-
 tests/safeHaskell/ghci/p2.stderr |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/safeHaskell/ghci/p2.script b/tests/safeHaskell/ghci/p2.script
index c219116..19133c7 100644
--- a/tests/safeHaskell/ghci/p2.script
+++ b/tests/safeHaskell/ghci/p2.script
@@ -4,7 +4,9 @@
 :set -XSafe
 
 -- we actually allow this for now but may want to revist this decision
+-- (as in, given we are in -XSafe, we may not want to allow package trust
+-- flags to be changed...)
 :set -trust base
 :set -distrust base
-:set -distrust-all
+:set -distrust-all-packages
 
diff --git a/tests/safeHaskell/ghci/p2.stderr b/tests/safeHaskell/ghci/p2.stderr
index c6efa9e..342bb05 100644
--- a/tests/safeHaskell/ghci/p2.stderr
+++ b/tests/safeHaskell/ghci/p2.stderr
@@ -1,2 +1,2 @@
-cannot satisfy -package -all
-    (use -v for more information)
+package flags have changed, resetting and loading new packages...
+package flags have changed, resetting and loading new packages...



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to