Commit e00058d8 authored by Simon Marlow's avatar Simon Marlow
Browse files

Make it so that 'make boot' is optional in the testsuite

mk/wordsize.mk and timeout/timeout get built automatically if necessary.
parent 7928d011
......@@ -5,12 +5,7 @@ SUBDIRS = timeout
CLEAN_FILES += mk/wordsize.mk
all :: boot
@echo "To run the tests, go into tests/ghc-regress and say \`make'."
@echo "More information about configuring and running the testsuite"
@echo "can be found in the file \`README' in this directory."
boot ::
$(CPP) $(RAWCPP_FLAGS) -x c mk/wordsize.mk.in > mk/wordsize.mk
all ::
cd tests/ghc-regress && $(MAKE) $(MFLAGS)
include $(TOP)/mk/target.mk
......@@ -5,13 +5,7 @@ NOTE: you need Python (any version >= 1.5 will probably do) in order
to use the testsuite.
To run the test suite against stage 1 of a GHC build in the same
source tree, first:
cd testsuite
make boot
This sets up the testsuite and builds the timeout tool which is used
when running tests. Then:
source tree:
cd tests/ghc-regress
make
......
......@@ -19,6 +19,9 @@
include $(TOP)/mk/wordsize.mk
$(TOP)/mk/wordsize.mk : $(TOP)/mk/wordsize.mk.in
$(CPP) $(RAWCPP_FLAGS) -x c $(TOP)/mk/wordsize.mk.in > $(TOP)/mk/wordsize.mk
ifeq "$(PYTHON)" ""
$(error Python must be installed in order to use the testsuite)
endif
......@@ -120,7 +123,13 @@ WAY =
all :: test
test:
timeout : $(TOP)/timeout/timeout$(exeext)
$(TOP)/timeout/timeout$(exeext) :
@echo "Looks like you don't have timeout, building it first..."
cd $(TOP)/timeout && $(MAKE) $(MFLAGS) all
test: timeout
$(PYTHON) $(RUNTESTS) $(RUNTEST_OPTS) \
$(patsubst %, --only=%, $(TEST)) \
$(patsubst %, --only=%, $(TESTS)) \
......
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