[commit: ghc] master: `make test` in root directory now runs fulltest (31d4f2e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/31d4f2e9c89e22a91f98b4a4aa0f80af6b07b60f/ghc

>---------------------------------------------------------------

commit 31d4f2e9c89e22a91f98b4a4aa0f80af6b07b60f
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Mar 2 11:10:09 2015 -0600

    `make test` in root directory now runs fulltest
    
    Summary:
    Currently, running `make test` in:
      /                   runs fast testsuite
      /testsuite          doesn't work
      /testsuite/tests    runs slow testsuite
    
    This commit:
      * changes `make test` in the ghc root directory to run the slow testsuite,
        just like it already does in `testsuite/tests`
      * adds some simple targets to `/testsuite`, that all delegate to
        `/testsuite/tests`
      * adds a new target `fasttest` to the toplevel Makefile, with a shorthand
        name `fast` (for consistency with /testsuite and /testsuite/tests)
      * declares some more targets PHONY for safety
    
    Wiki pages that need updating:
      * Building/StandardTargets
      * Buliding/RunningTests
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D685


>---------------------------------------------------------------

31d4f2e9c89e22a91f98b4a4aa0f80af6b07b60f
 Makefile             | 14 +++++++-------
 testsuite/Makefile   | 14 ++++++++++++++
 testsuite/mk/test.mk |  2 +-
 validate             |  4 ++--
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 2cc62b5..60853bc 100644
--- a/Makefile
+++ b/Makefile
@@ -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 401e30a..6ad3439 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 0229cfd..42022cd 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
 
diff --git a/validate b/validate
index 5954e96..109d521 100755
--- a/validate
+++ b/validate
@@ -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