Commit 9d561c34 authored by dterei's avatar dterei
Browse files

Fix up Safe Haskell tests for recent ghc changes.

parent 3d6dceab
......@@ -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')
], ''])
......
......@@ -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
......@@ -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'])
......
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment