Commit 6e691cac authored by thomie's avatar thomie

Testsuite: pass '-s --no-print-directory' to MAKE

This seems necessary after 9634e245 (#11569).
parent 0b00add0
......@@ -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 \
......
......@@ -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
......@@ -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 :
......
......@@ -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 :
......
......@@ -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 :
......
......@@ -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 :
......
......@@ -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 :
......
......@@ -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 :
......
......@@ -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
......
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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:
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
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