diff options
Diffstat (limited to 'testsuite/tests')
| -rw-r--r-- | testsuite/tests/backpack/cabal/bkpcabal02/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/cabal/t18567/all.T | 1 | ||||
| -rw-r--r-- | testsuite/tests/driver/T16318/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/tests/driver/T18125/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/tests/package/all.T | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/all.T b/testsuite/tests/backpack/cabal/bkpcabal02/all.T index 995f945080..ccedfce046 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal02/all.T +++ b/testsuite/tests/backpack/cabal/bkpcabal02/all.T @@ -5,6 +5,6 @@ else: test('bkpcabal02', [extra_files(['p', 'q', 'bkpcabal02.cabal', 'Setup.hs']), - js_broken(22351)], + js_broken(22351), normalise_version('bkpcabal01')], run_command, ['$MAKE -s --no-print-directory bkpcabal02 ' + cleanup]) diff --git a/testsuite/tests/cabal/t18567/all.T b/testsuite/tests/cabal/t18567/all.T index bbe84cda99..a01cd396ea 100644 --- a/testsuite/tests/cabal/t18567/all.T +++ b/testsuite/tests/cabal/t18567/all.T @@ -6,6 +6,7 @@ else: test('T18567', [ extra_files(['Setup.hs', 'sublib/', 'sublib-unused', 'src/', 'internal-lib.cabal']) , js_broken(22356) + , normalise_version('internal-lib') ], run_command, ['$MAKE -s --no-print-directory T18567 ' + cleanup]) diff --git a/testsuite/tests/driver/T16318/Makefile b/testsuite/tests/driver/T16318/Makefile index b6566cf145..9a6585745c 100644 --- a/testsuite/tests/driver/T16318/Makefile +++ b/testsuite/tests/driver/T16318/Makefile @@ -5,7 +5,7 @@ include $(TOP)/mk/test.mk test_pe = test-package-environment T16318: - "$(GHC_PKG)" latest base > $(test_pe) + "$(GHC_PKG)" field base id --simple-output > $(test_pe) "$(TEST_HC)" $(TEST_HC_OPTS) -v1 -ignore-dot-ghci -package-env $(test_pe) -e "putStrLn \"Hello\"" > out 2>&1 C=`cat out | grep "Loaded package environment" -c` ; \ if [ $$C != "1" ]; then false; fi diff --git a/testsuite/tests/driver/T18125/Makefile b/testsuite/tests/driver/T18125/Makefile index d54e05a8ee..fa4a3917e4 100644 --- a/testsuite/tests/driver/T18125/Makefile +++ b/testsuite/tests/driver/T18125/Makefile @@ -6,8 +6,8 @@ test_pe = test-package-environment test_lib = containers T18125: - "$(GHC_PKG)" latest base > $(test_pe) - "$(GHC_PKG)" latest $(test_lib) >> $(test_pe) + "$(GHC_PKG)" field base id --simple-output > $(test_pe) + "$(GHC_PKG)" field $(test_lib) id --simple-outpu >> $(test_pe) "$(TEST_HC)" $(TEST_HC_OPTS) -Wunused-packages -package-env $(test_pe) T18125.hs > out 2>&1 C=`cat out | grep "$(test_lib)" -c` ; \ if [ $$C != "1" ]; then false; fi diff --git a/testsuite/tests/ghci/scripts/Makefile b/testsuite/tests/ghci/scripts/Makefile index a76b8c090c..39c6c74dde 100644 --- a/testsuite/tests/ghci/scripts/Makefile +++ b/testsuite/tests/ghci/scripts/Makefile @@ -69,4 +69,4 @@ T12023: .PHONY: T19650_setup T19650_setup: - '$(GHC_PKG)' latest base > my_package_env + '$(GHC_PKG)' field base id --simple-output > my_package_env diff --git a/testsuite/tests/package/all.T b/testsuite/tests/package/all.T index e5d7151b67..89b2ba7a56 100644 --- a/testsuite/tests/package/all.T +++ b/testsuite/tests/package/all.T @@ -19,4 +19,4 @@ test('package09e', normal, compile_fail, ['-package "containers (Data.Map as M, test('package10', normal, compile, ['-hide-all-packages -package "ghc (GHC.Types.Unique.FM as Prelude)" ']) test('T4806', normalise_version('containers'), compile_fail, ['-ignore-package containers']) -test('T4806a', normalise_version('deepseq', 'containers'), compile_fail, ['-ignore-package deepseq']) +test('T4806a', normalise_version('deepseq', 'containers', 'template-haskell'), compile_fail, ['-ignore-package deepseq']) |