Commit 31d4f2e9 authored by thomie's avatar thomie Committed by Austin Seipp

`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
parent ca478acc
......@@ -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
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment