Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8e093e43a84647a43cccba68730365de7f9febd1 >--------------------------------------------------------------- commit 8e093e43a84647a43cccba68730365de7f9febd1 Author: David Terei <[email protected]> Date: Tue Jul 12 12:59:18 2011 -0700 Fixes to safe haskell tests when run with THREAD >--------------------------------------------------------------- tests/ghc-regress/safeHaskell/check/pkg01/Makefile | 16 ++++++++-------- tests/ghc-regress/safeHaskell/check/pkg01/all.T | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/ghc-regress/safeHaskell/check/pkg01/Makefile b/tests/ghc-regress/safeHaskell/check/pkg01/Makefile index 97af788..1c979a1 100644 --- a/tests/ghc-regress/safeHaskell/check/pkg01/Makefile +++ b/tests/ghc-regress/safeHaskell/check/pkg01/Makefile @@ -17,15 +17,15 @@ clean: PREFIX := $(abspath install) $(eval $(call canonicalise,PREFIX)) -PKGCONF=local.db -LGHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF) +PKGCONF = local.db +LGHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f '$(PKGCONF)' safePkg01: - $(MAKE) clean + '$(MAKE)' clean '$(TEST_HC)' --make -o setup Setup.hs -v0 '$(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 copy -v0 ./setup register --inplace -v0 @@ -33,14 +33,14 @@ safePkg01: $(LGHC_PKG) field safePkg01-1.0 trusted echo 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 '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 '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 '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:' diff --git a/tests/ghc-regress/safeHaskell/check/pkg01/all.T b/tests/ghc-regress/safeHaskell/check/pkg01/all.T index 485b3eb..bdbdc4c 100644 --- a/tests/ghc-regress/safeHaskell/check/pkg01/all.T +++ b/tests/ghc-regress/safeHaskell/check/pkg01/all.T @@ -10,15 +10,15 @@ else: prof = '' test('safePkg01', - normal, + [normal, alone], run_command, ['$MAKE -s --no-print-directory safePkg01 PROF=' + prof]) 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']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
