summaryrefslogtreecommitdiff
path: root/testsuite/tests/driver
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2016-02-21 01:50:22 +0100
committerThomas Miedema <thomasmiedema@gmail.com>2016-02-21 01:51:13 +0100
commit6e691cacd6484b02df72f3e46a1d2ed0779a3107 (patch)
treefb3e251bccb4a5d0a8e1671cd89bd3a5f64f0637 /testsuite/tests/driver
parent0b00add03043804211f567a3d0810114c0274252 (diff)
downloadhaskell-6e691cacd6484b02df72f3e46a1d2ed0779a3107.tar.gz
Testsuite: pass '-s --no-print-directory' to MAKE
This seems necessary after 9634e24 (#11569).
Diffstat (limited to 'testsuite/tests/driver')
-rw-r--r--testsuite/tests/driver/T1372/Makefile10
-rw-r--r--testsuite/tests/driver/T1959/Makefile6
-rw-r--r--testsuite/tests/driver/T3007/Makefile2
-rw-r--r--testsuite/tests/driver/dynamicToo/dynamicToo004/Makefile2
-rw-r--r--testsuite/tests/driver/recomp007/Makefile8
-rw-r--r--testsuite/tests/driver/recomp008/Makefile6
6 files changed, 17 insertions, 17 deletions
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