Commit 1dbfdf4a authored by dterei's avatar dterei
Browse files

Fixes to safe haskell tests when run with THREAD

parent c7dd6dbb
...@@ -17,15 +17,15 @@ clean: ...@@ -17,15 +17,15 @@ clean:
PREFIX := $(abspath install) PREFIX := $(abspath install)
$(eval $(call canonicalise,PREFIX)) $(eval $(call canonicalise,PREFIX))
PKGCONF=local.db PKGCONF = local.db
LGHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF) LGHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f '$(PKGCONF)'
safePkg01: safePkg01:
$(MAKE) clean '$(MAKE)' clean
'$(TEST_HC)' --make -o setup Setup.hs -v0 '$(TEST_HC)' --make -o setup Setup.hs -v0
'$(GHC_PKG)' init local.db '$(GHC_PKG)' init local.db
./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS) -trust base' --with-hc-pkg='$(GHC_PKG)' --package-db=${PKGCONF} $(PROF) ./setup configure -v0 --prefix='$(PREFIX)' --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS) -trust base' --with-hc-pkg='$(GHC_PKG)' --package-db='$(PKGCONF)' $(PROF)
./setup build -v0 ./setup build -v0
./setup copy -v0 ./setup copy -v0
./setup register --inplace -v0 ./setup register --inplace -v0
...@@ -33,14 +33,14 @@ safePkg01: ...@@ -33,14 +33,14 @@ safePkg01:
$(LGHC_PKG) field safePkg01-1.0 trusted $(LGHC_PKG) field safePkg01-1.0 trusted
echo echo
echo 'M_SafePkg' echo 'M_SafePkg'
$(TEST_HC) --show-iface dist/build/M_SafePkg.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' '$(TEST_HC)' --show-iface dist/build/M_SafePkg.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo echo
echo 'M_SafePkg2' echo 'M_SafePkg2'
$(TEST_HC) --show-iface dist/build/M_SafePkg2.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' '$(TEST_HC)' --show-iface dist/build/M_SafePkg2.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo echo
echo 'M_SafePkg3' echo 'M_SafePkg3'
$(TEST_HC) --show-iface dist/build/M_SafePkg3.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' '$(TEST_HC)' --show-iface dist/build/M_SafePkg3.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo echo
echo 'M_SafePkg4' echo 'M_SafePkg4'
$(TEST_HC) --show-iface dist/build/M_SafePkg4.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' '$(TEST_HC)' --show-iface dist/build/M_SafePkg4.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
...@@ -10,15 +10,15 @@ else: ...@@ -10,15 +10,15 @@ else:
prof = '' prof = ''
test('safePkg01', test('safePkg01',
normal, [normal, alone],
run_command, run_command,
['$MAKE -s --no-print-directory safePkg01 PROF=' + prof]) ['$MAKE -s --no-print-directory safePkg01 PROF=' + prof])
test('ImpSafe01', normal, compile_fail, ['']) test('ImpSafe01', normal, compile_fail, [''])
test('ImpSafeOnly01', normal, compile, ['-package-conf local.db -trust base']) test('ImpSafeOnly01', [normal, alone], compile, ['-package-conf local.db -trust base'])
test('ImpSafeOnly02', normal, compile, ['-package-conf local.db -trust base -trust safePkg01']) test('ImpSafeOnly02', [normal, alone], compile, ['-package-conf local.db -trust base -trust safePkg01'])
test('ImpSafeOnly03', normal, compile_fail, ['-package-conf local.db -trust base']) test('ImpSafeOnly03', [normal, alone], compile_fail, ['-package-conf local.db -trust base'])
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