diff options
author | Thomas Miedema <thomasmiedema@gmail.com> | 2016-02-21 01:50:22 +0100 |
---|---|---|
committer | Thomas Miedema <thomasmiedema@gmail.com> | 2016-02-21 01:51:13 +0100 |
commit | 6e691cacd6484b02df72f3e46a1d2ed0779a3107 (patch) | |
tree | fb3e251bccb4a5d0a8e1671cd89bd3a5f64f0637 /testsuite/tests/cabal | |
parent | 0b00add03043804211f567a3d0810114c0274252 (diff) | |
download | haskell-6e691cacd6484b02df72f3e46a1d2ed0779a3107.tar.gz |
Testsuite: pass '-s --no-print-directory' to MAKE
This seems necessary after 9634e24 (#11569).
Diffstat (limited to 'testsuite/tests/cabal')
-rw-r--r-- | testsuite/tests/cabal/cabal01/Makefile | 4 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal03/Makefile | 4 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal04/Makefile | 4 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal05/Makefile | 4 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal06/Makefile | 4 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal08/Makefile | 4 | ||||
-rw-r--r-- | testsuite/tests/cabal/sigcabal01/Makefile | 4 |
7 files changed, 14 insertions, 14 deletions
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 : |