diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-01-14 19:16:21 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-01-14 19:16:21 +0000 |
| commit | 080376c39618bfd3ad4b2a33298fce083a634342 (patch) | |
| tree | dc886598979e6bca022d4bde76509dea65836e5a /testsuite/Makefile | |
| parent | 0bb2b537f7b104e1665db6d5c4a4fcc925695c21 (diff) | |
| download | haskell-080376c39618bfd3ad4b2a33298fce083a634342.tar.gz | |
Move the Makefile changes around so they don't cause test failures
Our "make clean" detection was causing problems for tests which had
their own local clean target.
Diffstat (limited to 'testsuite/Makefile')
| -rw-r--r-- | testsuite/Makefile | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/testsuite/Makefile b/testsuite/Makefile index 5a2fcce79d..982314e32a 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -1,4 +1,14 @@ + TOP = . + +# If we're cleaning then we don't want to do all the GHC detection hardwork, +# and we certainly don't want to fail if GHC etc can't be found! +# However, we can't just put this conditional in boilerplate.mk, as +# some of the tests have a "clean" makefile target that relies on GHC_PKG +# being defined. +ifneq "$(MAKECMDGOALS)" "clean" +ifneq "$(MAKECMDGOALS)" "distclean" + include $(TOP)/mk/boilerplate.mk boot: @@ -7,6 +17,9 @@ boot: all: $(MAKE) -C $(TOP)/tests/ghc-regress all +endif +endif + clean distclean: $(MAKE) -C $(TOP)/timeout $@ |