[commit: testsuite] master: Fix up Safe Haskell tests for recent ghc changes. (fcdb020)

[David Terei]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/fcdb0208ccbcace3344bde071a64898e2e3aa1a2

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

commit fcdb0208ccbcace3344bde071a64898e2e3aa1a2
Author: David Terei <davidterei at gmail.com>
Date:   Tue Aug 9 13:20:39 2011 -0700

    Fix up Safe Haskell tests for recent ghc changes.

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

 tests/safeHaskell/check/all.T                  |    2 +-
 tests/safeHaskell/check/pkg01/Makefile         |    5 ++++-
 tests/safeHaskell/check/pkg01/all.T            |    2 +-
 tests/safeHaskell/check/pkg01/safePkg01.stdout |    5 ++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/safeHaskell/check/all.T b/tests/safeHaskell/check/all.T
index 2e769ba..0b8c7cb 100644
--- a/tests/safeHaskell/check/all.T
+++ b/tests/safeHaskell/check/all.T
@@ -10,7 +10,7 @@ test('CheckB',
      multimod_compile, ['CheckB', '-trust base'])
 
 # fail as we don't trust base when compiling Check01
-test('Check01', normal, multi_compile_fail, ['Check01', [
+test('Check01', normal, multi_compile_fail, ['Check01 -distrust base', [
                                             ('Check01_A.hs', ''),
                                             ('Check01_B.hs', '-trust base')
                                             ], ''])
diff --git a/tests/safeHaskell/check/pkg01/Makefile b/tests/safeHaskell/check/pkg01/Makefile
index 7cc8049..7c18381 100644
--- a/tests/safeHaskell/check/pkg01/Makefile
+++ b/tests/safeHaskell/check/pkg01/Makefile
@@ -43,4 +43,7 @@ safePkg01:
 	echo
 	echo 'M_SafePkg4'
 	'$(TEST_HC)' --show-iface dist/build/M_SafePkg4.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
-
+	echo
+	echo 'Testing setting trust'
+	$(LGHC_PKG) distrust safePkg01-1.0
+	$(LGHC_PKG) field safePkg01-1.0 trusted
diff --git a/tests/safeHaskell/check/pkg01/all.T b/tests/safeHaskell/check/pkg01/all.T
index bdbdc4c..def8d88 100644
--- a/tests/safeHaskell/check/pkg01/all.T
+++ b/tests/safeHaskell/check/pkg01/all.T
@@ -14,7 +14,7 @@ test('safePkg01',
      run_command, 
      ['$MAKE -s --no-print-directory safePkg01 PROF=' + prof])
 
-test('ImpSafe01', normal, compile_fail, [''])
+test('ImpSafe01', normal, compile_fail, ['-distrust base'])
 
 test('ImpSafeOnly01', [normal, alone], compile, ['-package-conf local.db -trust base'])
 
diff --git a/tests/safeHaskell/check/pkg01/safePkg01.stdout b/tests/safeHaskell/check/pkg01/safePkg01.stdout
index c1a5642..13a91d3 100644
--- a/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -1,7 +1,7 @@
 local.db:
     safePkg01-1.0
 
-trusted: False
+trusted: True
 
 M_SafePkg
 package dependencies: base* ghc-prim integer-gmp
@@ -22,3 +22,6 @@ M_SafePkg4
 package dependencies: base* ghc-prim integer-gmp
 trusted: safe
 require own pkg trusted: True
+
+Testing setting trust
+trusted: False