diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | testsuite/Makefile | 14 | ||||
| -rw-r--r-- | testsuite/mk/test.mk | 2 | ||||
| -rwxr-xr-x | validate | 4 |
4 files changed, 24 insertions, 10 deletions
@@ -25,6 +25,7 @@ install show: else +.PHONY: default default : all @: @@ -52,7 +53,7 @@ endif endif # No need to update makefiles for these targets: -REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show echo help test fulltest,$(MAKECMDGOALS)) +REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show echo help test fulltest fast fasttest,$(MAKECMDGOALS)) # configure touches certain files even if they haven't changed. This # can mean a lot of unnecessary recompilation after a re-configure, so @@ -65,7 +66,7 @@ REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framewor # NB. not the same as saying '%: ...', which doesn't do the right thing: # it does nothing if we specify a target that already exists. -.PHONY: $(REALGOALS) +.PHONY: $(REALGOALS) all $(REALGOALS) all: mk/config.mk.old mk/project.mk.old compiler/ghc.cabal.old ifneq "$(OMIT_PHASE_0)" "YES" @echo "===--- building phase 0" @@ -111,11 +112,10 @@ endif endif -.PHONY: test -test: +.PHONY: fasttest fast +fasttest fast: $(MAKE) -C testsuite/tests CLEANUP=1 OUTPUT_SUMMARY=../../testsuite_summary.txt fast -.PHONY: fulltest -fulltest: +.PHONY: fulltest test +fulltest test: $(MAKE) -C testsuite/tests CLEANUP=1 OUTPUT_SUMMARY=../../testsuite_summary.txt - diff --git a/testsuite/Makefile b/testsuite/Makefile index 401e30a590..6ad34393fc 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -11,15 +11,29 @@ ifneq "$(MAKECMDGOALS)" "maintainer-clean" include $(TOP)/mk/boilerplate.mk +.PHONY: all boot test verbose accept fast list_broken + boot: $(MAKE) -C $(TOP)/timeout all all: $(MAKE) -C $(TOP)/tests all +test: + $(MAKE) -C $(TOP)/tests test + +verbose: + $(MAKE) -C $(TOP)/tests verbose + +accept: + $(MAKE) -C $(TOP)/tests accept + fast: $(MAKE) -C $(TOP)/tests fast +list_broken: + $(MAKE) -C $(TOP)/tests list_broken + endif endif endif diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 0229cfd5b3..42022cd958 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -241,7 +241,7 @@ TESTS = TEST = WAY = -.PHONY: all boot test verbose accept fast +.PHONY: all boot test verbose accept fast list_broken all: test @@ -229,11 +229,11 @@ SLOW) BINDIST="BINDIST=YES" ;; NORMAL) - MAKE_TEST_TARGET=test + MAKE_TEST_TARGET=fasttest BINDIST="BINDIST=YES" ;; FAST) - MAKE_TEST_TARGET=test + MAKE_TEST_TARGET=fasttest BINDIST="BINDIST=NO" ;; esac |