diff options
23 files changed, 49 insertions, 49 deletions
diff --git a/testsuite/tests/annotations/should_compile/th/Makefile b/testsuite/tests/annotations/should_compile/th/Makefile index b10fc725db..9f1db83802 100644 --- a/testsuite/tests/annotations/should_compile/th/Makefile +++ b/testsuite/tests/annotations/should_compile/th/Makefile @@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk annth_make: - $(MAKE) clean_annth_make + $(MAKE) -s --no-print-directory clean_annth_make mkdir build_make '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 --make \ -odir build_make -hidir build_make -o build_make/annth annth.hs @@ -12,7 +12,7 @@ clean_annth_make: rm -rf build_make annth_compunits: - $(MAKE) clean_annth_compunits + $(MAKE) -s --no-print-directory clean_annth_compunits mkdir build_compunits '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 \ -odir build_compunits -hidir build_compunits \ diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile index f1b74b4c68..ff7f130f62 100644 --- a/testsuite/tests/cabal/cabal01/Makefile +++ b/testsuite/tests/cabal/cabal01/Makefile @@ -20,7 +20,7 @@ PREFIX := $(abspath install) $(eval $(call canonicalise,PREFIX)) cabal01: - $(MAKE) clean + $(MAKE) -s --no-print-directory clean '$(TEST_HC)' --make -o setup Setup.lhs -v0 '$(GHC_PKG)' init local.db @@ -41,4 +41,4 @@ cabal01: ./setup sdist -v0 echo dist: ls -1 dist - if [ "$(CLEANUP)" != "" ]; then $(MAKE) clean; fi + if [ "$(CLEANUP)" != "" ]; then $(MAKE) -s --no-print-directory clean; fi diff --git a/testsuite/tests/cabal/cabal03/Makefile b/testsuite/tests/cabal/cabal03/Makefile index 97659344d9..fbd02c553d 100644 --- a/testsuite/tests/cabal/cabal03/Makefile +++ b/testsuite/tests/cabal/cabal03/Makefile @@ -16,7 +16,7 @@ SETUP=../Setup -v0 # Currently the error message from GHC is swallowed by Cabal. cabal03: clean - $(MAKE) clean + $(MAKE) -s --no-print-directory clean '$(GHC_PKG)' init tmp.d '$(TEST_HC)' -v0 --make Setup cd p && $(SETUP) clean @@ -32,7 +32,7 @@ cabal03: clean cd p && $(SETUP) register cd r && ! ../Setup configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force ifneq "$(CLEANUP)" "" - $(MAKE) clean + $(MAKE) -s --no-print-directory clean endif clean : diff --git a/testsuite/tests/cabal/cabal04/Makefile b/testsuite/tests/cabal/cabal04/Makefile index 6c43dde45d..408a725717 100644 --- a/testsuite/tests/cabal/cabal04/Makefile +++ b/testsuite/tests/cabal/cabal04/Makefile @@ -11,14 +11,14 @@ SETUP=./Setup -v0 # building the shared library (-rtsopts has no effect with -shared) cabal04: - $(MAKE) clean + $(MAKE) -s --no-print-directory clean '$(TEST_HC)' -v0 --make Setup $(SETUP) clean $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' $(VANILLA) $(PROF) $(DYN) $(SETUP) build 2> err ! grep -v "Creating library file" err ifneq "$(CLEANUP)" "" - $(MAKE) clean + $(MAKE) -s --no-print-directory clean endif clean : diff --git a/testsuite/tests/cabal/cabal05/Makefile b/testsuite/tests/cabal/cabal05/Makefile index d1ade74113..981ee6f91c 100644 --- a/testsuite/tests/cabal/cabal05/Makefile +++ b/testsuite/tests/cabal/cabal05/Makefile @@ -27,7 +27,7 @@ SETUP = ../Setup -v0 # should be exposed or hidden. cabal05: clean - $(MAKE) clean + $(MAKE) -s --no-print-directory clean '$(GHC_PKG)' init tmp.d '$(TEST_HC)' -v0 --make Setup # build p @@ -62,7 +62,7 @@ cabal05: clean cd t && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d ! (cd t && $(SETUP) build) ifneq "$(CLEANUP)" "" - $(MAKE) clean + $(MAKE) -s --no-print-directory clean endif clean : diff --git a/testsuite/tests/cabal/cabal06/Makefile b/testsuite/tests/cabal/cabal06/Makefile index 9f47ea5756..c42c5fb24f 100644 --- a/testsuite/tests/cabal/cabal06/Makefile +++ b/testsuite/tests/cabal/cabal06/Makefile @@ -22,7 +22,7 @@ SETUP=../Setup -v0 # dependencies it needs. cabal06: clean - $(MAKE) clean + $(MAKE) -s --no-print-directory clean '$(GHC_PKG)' init tmp.d '$(TEST_HC)' -v0 --make Setup cd p-1.0 && $(SETUP) clean @@ -60,7 +60,7 @@ cabal06: clean inst-e/bin/cabal06 inst-f/bin/cabal06 ifneq "$(CLEANUP)" "" - $(MAKE) clean + $(MAKE) -s --no-print-directory clean endif clean : diff --git a/testsuite/tests/cabal/cabal08/Makefile b/testsuite/tests/cabal/cabal08/Makefile index 06b98533c8..2d6ad9500c 100644 --- a/testsuite/tests/cabal/cabal08/Makefile +++ b/testsuite/tests/cabal/cabal08/Makefile @@ -6,7 +6,7 @@ SETUP=../Setup -v0 # in both cases, p2 should be preferred cabal08: clean - $(MAKE) clean + $(MAKE) -s --no-print-directory clean '$(GHC_PKG)' init tmp1.d '$(GHC_PKG)' init tmp2.d '$(TEST_HC)' -v0 --make Setup @@ -25,7 +25,7 @@ cabal08: clean '$(TEST_HC)' $(TEST_HC_OPTS) -package-db tmp1.d -package-db tmp2.d -hide-all-packages -package base -package p Main.hs ./Main ifneq "$(CLEANUP)" "" - $(MAKE) clean + $(MAKE) -s --no-print-directory clean endif clean : diff --git a/testsuite/tests/cabal/sigcabal01/Makefile b/testsuite/tests/cabal/sigcabal01/Makefile index 73cffd7a68..0e72ff63ca 100644 --- a/testsuite/tests/cabal/sigcabal01/Makefile +++ b/testsuite/tests/cabal/sigcabal01/Makefile @@ -7,7 +7,7 @@ SETUP=../Setup -v0 # This test is for a Cabal package with holes sigcabal01: - $(MAKE) clean + $(MAKE) -s --no-print-directory clean '$(GHC_PKG)' field containers id | sed 's/^.*: *//' > containers '$(GHC_PKG)' init tmp.d '$(TEST_HC)' -v0 --make Setup @@ -25,7 +25,7 @@ sigcabal01: '$(TEST_HC)' $(TEST_HC_OPTS) -package-db=tmp.d -hide-all-packages -package base -package containers -package-id "`cat p_lazy` (P as P.Lazy)" -package-id "`cat p_strict` (P as P.Strict)" --make Main.hs ! ./Main ifneq "$(CLEANUP)" "" - $(MAKE) clean + $(MAKE) -s --no-print-directory clean endif clean : diff --git a/testsuite/tests/driver/T1372/Makefile b/testsuite/tests/driver/T1372/Makefile index acd6b66d20..22260cf6e3 100644 --- a/testsuite/tests/driver/T1372/Makefile +++ b/testsuite/tests/driver/T1372/Makefile @@ -18,18 +18,18 @@ clean: rm -rf $(LOCAL_PKGCONF) T1372: - $(MAKE) clean - $(MAKE) prep + $(MAKE) -s --no-print-directory clean + $(MAKE) -s --no-print-directory prep # This should recompile Main.hs, because A in package p1 has changed # and recompiling Main.hs will now fail. -cd p2 && ./setup build -v0 - $(MAKE) clean + $(MAKE) -s --no-print-directory clean prep: "$(GHC_PKG)" init $(LOCAL_PKGCONF) cp p1/A1.hs p1/A.hs - $(MAKE) prep.p1 - $(MAKE) prep.p2 + $(MAKE) -s --no-print-directory prep.p1 + $(MAKE) -s --no-print-directory prep.p2 cp p1/A2.hs p1/A.hs cd p1 && ./setup build -v0 diff --git a/testsuite/tests/driver/T1959/Makefile b/testsuite/tests/driver/T1959/Makefile index f7db491d96..73b321f2a9 100644 --- a/testsuite/tests/driver/T1959/Makefile +++ b/testsuite/tests/driver/T1959/Makefile @@ -19,11 +19,11 @@ clean :: rm -f *.o *.hi E.hs dotest :: - $(MAKE) clean + $(MAKE) -s --no-print-directory clean cp E1.hs E.hs - $(MAKE) compile + $(MAKE) -s --no-print-directory compile ./prog sleep 1 cp E2.hs E.hs - $(MAKE) compile + $(MAKE) -s --no-print-directory compile ./prog diff --git a/testsuite/tests/driver/T3007/Makefile b/testsuite/tests/driver/T3007/Makefile index 8b78a49261..09db27a38f 100644 --- a/testsuite/tests/driver/T3007/Makefile +++ b/testsuite/tests/driver/T3007/Makefile @@ -9,7 +9,7 @@ clean: rm -rf package.conf T3007: - $(MAKE) clean + $(MAKE) -s --no-print-directory clean '$(GHC_PKG)' init package.conf cd A && '$(TEST_HC)' -v0 --make Setup cd A && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-option=-package-db../package.conf diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo004/Makefile b/testsuite/tests/driver/dynamicToo/dynamicToo004/Makefile index 16ea1930af..cb25be52ad 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo004/Makefile +++ b/testsuite/tests/driver/dynamicToo/dynamicToo004/Makefile @@ -18,7 +18,7 @@ clean: .PHONY: dynamicToo004 dynamicToo004: - $(MAKE) clean + $(MAKE) -s --no-print-directory clean "$(GHC_PKG)" init $(LOCAL_PKGCONF) "$(TEST_HC)" -v0 --make Setup.hs diff --git a/testsuite/tests/driver/recomp007/Makefile b/testsuite/tests/driver/recomp007/Makefile index 18ac7bdd90..0ced239efe 100644 --- a/testsuite/tests/driver/recomp007/Makefile +++ b/testsuite/tests/driver/recomp007/Makefile @@ -12,13 +12,13 @@ clean: rm -rf $(LOCAL_PKGCONF) recomp007: - $(MAKE) clean + $(MAKE) -s --no-print-directory clean "$(GHC_PKG)" init $(LOCAL_PKGCONF) "$(TEST_HC)" -v0 --make Setup.hs - $(MAKE) prep.a1 - $(MAKE) prep.b + $(MAKE) -s --no-print-directory prep.a1 + $(MAKE) -s --no-print-directory prep.b "$(GHC_PKG)" unregister --package-db=$(LOCAL_PKGCONF) a-1.0 - $(MAKE) prep.a2 + $(MAKE) -s --no-print-directory prep.a2 cd b && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF) cd b && ../Setup build diff --git a/testsuite/tests/driver/recomp008/Makefile b/testsuite/tests/driver/recomp008/Makefile index b382f4f685..f1ade78434 100644 --- a/testsuite/tests/driver/recomp008/Makefile +++ b/testsuite/tests/driver/recomp008/Makefile @@ -22,11 +22,11 @@ clean : $(RM) *.hi *.o prog recomp008 : - $(MAKE) clean + $(MAKE) -s --no-print-directory clean cp A1.hs A.hs - $(MAKE) prog + $(MAKE) -s --no-print-directory prog ./prog sleep 1 cp A2.hs A.hs - $(MAKE) prog + $(MAKE) -s --no-print-directory prog ./prog diff --git a/testsuite/tests/module/mod175/Makefile b/testsuite/tests/module/mod175/Makefile index 65fb2758d8..e2c8b66893 100644 --- a/testsuite/tests/module/mod175/Makefile +++ b/testsuite/tests/module/mod175/Makefile @@ -11,7 +11,7 @@ clean: # invocation as the main-is flag now applies to it). mod175: - $(MAKE) clean + $(MAKE) -s --no-print-directory clean '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -main-is Test.main Test.hs -o test '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -main-is Test2.main Test2.hs -o test2 ./test diff --git a/testsuite/tests/plugins/annotation-plugin/Makefile b/testsuite/tests/plugins/annotation-plugin/Makefile index b6aa22005e..7ce5b78e75 100644 --- a/testsuite/tests/plugins/annotation-plugin/Makefile +++ b/testsuite/tests/plugins/annotation-plugin/Makefile @@ -9,7 +9,7 @@ HERE := $(abspath .) $(eval $(call canonicalise,HERE)) package.%: - $(MAKE) clean.$* + $(MAKE) -s --no-print-directory clean.$* mkdir pkg.$* "$(TEST_HC)" -outputdir pkg.$* --make -v0 -o pkg.$*/setup Setup.hs "$(GHC_PKG)" init pkg.$*/local.package.conf diff --git a/testsuite/tests/plugins/rule-defining-plugin/Makefile b/testsuite/tests/plugins/rule-defining-plugin/Makefile index 19422800c8..5a0289c99b 100644 --- a/testsuite/tests/plugins/rule-defining-plugin/Makefile +++ b/testsuite/tests/plugins/rule-defining-plugin/Makefile @@ -9,7 +9,7 @@ HERE := $(abspath .) $(eval $(call canonicalise,HERE)) package.%: - $(MAKE) clean.$* + $(MAKE) -s --no-print-directory clean.$* mkdir pkg.$* "$(TEST_HC)" -outputdir pkg.$* --make -v0 -o pkg.$*/setup Setup.hs "$(GHC_PKG)" init pkg.$*/local.package.conf diff --git a/testsuite/tests/plugins/simple-plugin/Makefile b/testsuite/tests/plugins/simple-plugin/Makefile index 6d9829f15c..ae5c24e87f 100644 --- a/testsuite/tests/plugins/simple-plugin/Makefile +++ b/testsuite/tests/plugins/simple-plugin/Makefile @@ -9,7 +9,7 @@ HERE := $(abspath .) $(eval $(call canonicalise,HERE)) package.%: - $(MAKE) clean.$* + $(MAKE) -s --no-print-directory clean.$* mkdir pkg.$* "$(TEST_HC)" -outputdir pkg.$* --make -v0 -o pkg.$*/setup Setup.hs diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile index 70bcfd4b87..094506dc10 100644 --- a/testsuite/tests/rts/Makefile +++ b/testsuite/tests/rts/Makefile @@ -6,14 +6,14 @@ outofmem-prep:: '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -fforce-recomp outofmem.hs -o outofmem outofmem:: - @$(MAKE) outofmem-prep + $(MAKE) -s --no-print-directory outofmem-prep @ulimit -m 10000000 2>/dev/null; ./outofmem || echo "exit($$?)" outofmem2-prep:: '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -rtsopts --make -fforce-recomp outofmem2.hs -o outofmem2 outofmem2:: - @$(MAKE) outofmem2-prep + $(MAKE) -s --no-print-directory outofmem2-prep @ulimit -m 1000000 2>/dev/null; ./outofmem2 +RTS -M5m -RTS || echo "exit($$?)" T2615-prep: diff --git a/testsuite/tests/safeHaskell/check/pkg01/Makefile b/testsuite/tests/safeHaskell/check/pkg01/Makefile index a53b4e617e..5d4fd73266 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/Makefile +++ b/testsuite/tests/safeHaskell/check/pkg01/Makefile @@ -15,7 +15,7 @@ HI_SUF = hi endif mkPackageDatabase.%: - '$(MAKE)' cleanPackageDatabase.$* + $(MAKE) -s --no-print-directory cleanPackageDatabase.$* mkdir pdb.$* '$(TEST_HC)' -outputdir pdb.$* -o pdb.$*/setup Setup.hs -v0 @@ -38,7 +38,7 @@ safePkg01_GHC_PKG = '$(GHC_PKG)' --no-user-package-db -f pdb.safePkg01/local.db SHOW_IFACE=-dppr-cols999 --show-iface safePkg01: - '$(MAKE)' mkPackageDatabase.safePkg01 + $(MAKE) -s --no-print-directory mkPackageDatabase.safePkg01 $(safePkg01_GHC_PKG) list $(safePkg01_GHC_PKG) field safePkg01-1.0 trusted diff --git a/testsuite/tests/safeHaskell/safeLanguage/Makefile b/testsuite/tests/safeHaskell/safeLanguage/Makefile index 5e1420f65f..1662c8066f 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/Makefile +++ b/testsuite/tests/safeHaskell/safeLanguage/Makefile @@ -10,7 +10,7 @@ cleanSafeRecomp01: # Just a single file safeRecomp01: - '$(MAKE)' cleanSafeRecomp01 + $(MAKE) -s --no-print-directory cleanSafeRecomp01 '$(TEST_HC)' -c SafeRecomp01.hs '$(TEST_HC)' --show-iface SafeRecomp01.hi | grep -E '^trusted:' @@ -41,7 +41,7 @@ cleanSafeRecomp02: # mutli module program safeRecomp02: - '$(MAKE)' cleanSafeRecomp02 + $(MAKE) -s --no-print-directory cleanSafeRecomp02 '$(TEST_HC)' -c SafeRecomp02_A.hs '$(TEST_HC)' --make SafeRecomp02.hs diff --git a/testsuite/tests/simplCore/should_compile/T7702plugin/Makefile b/testsuite/tests/simplCore/should_compile/T7702plugin/Makefile index beba0dded8..b4911a0de9 100644 --- a/testsuite/tests/simplCore/should_compile/T7702plugin/Makefile +++ b/testsuite/tests/simplCore/should_compile/T7702plugin/Makefile @@ -9,7 +9,7 @@ HERE := $(abspath .) $(eval $(call canonicalise,HERE)) package.%: - $(MAKE) clean.$* + $(MAKE) -s --no-print-directory clean.$* mkdir pkg.$* "$(TEST_HC)" -outputdir pkg.$* --make -v0 -o pkg.$*/setup Setup.hs diff --git a/testsuite/tests/typecheck/bug1465/Makefile b/testsuite/tests/typecheck/bug1465/Makefile index 22fa477a39..706b26bbb1 100644 --- a/testsuite/tests/typecheck/bug1465/Makefile +++ b/testsuite/tests/typecheck/bug1465/Makefile @@ -14,15 +14,15 @@ clean: rm -rf $(LOCAL_PKGCONF) bug1465: - $(MAKE) clean - $(MAKE) prep + $(MAKE) -s --no-print-directory clean + $(MAKE) -s --no-print-directory prep '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(LOCAL_PKGCONF) -c C.hs || exit 0 - $(MAKE) clean + $(MAKE) -s --no-print-directory clean prep: '$(GHC_PKG)' init $(LOCAL_PKGCONF) - $(MAKE) prep.v1 - $(MAKE) prep.v2 + $(MAKE) -s --no-print-directory prep.v1 + $(MAKE) -s --no-print-directory prep.v2 '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(LOCAL_PKGCONF) -c -package $(PKG)-1.0 B1.hs '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(LOCAL_PKGCONF) -c -package $(PKG)-2.0 B2.hs |