diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-23 20:24:43 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-23 20:24:43 +0000 |
| commit | aec015c6deefba69b4d181be9ba67f1930577bea (patch) | |
| tree | 234b4d5758b4161856230b7984b394366e728c6c /testsuite/mk/test.mk | |
| parent | 89792c20e13e009f42a6bf5f52dc0348ff10f928 (diff) | |
| download | haskell-aec015c6deefba69b4d181be9ba67f1930577bea.tar.gz | |
Build the timeout program with Cabal
Diffstat (limited to 'testsuite/mk/test.mk')
| -rw-r--r-- | testsuite/mk/test.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index f1478217bc..0b7f6a042c 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -104,7 +104,7 @@ RUNTEST_OPTS += \ -e config.wordsize=\"$(WORDSIZE)\" \ -e default_testopts.cleanup=\"$(CLEANUP)\" \ -e config.timeout="int($(TIMEOUT)) or config.timeout" \ - -e config.timeout_prog=\"$(TOP)/timeout/timeout\" \ + -e config.timeout_prog=\"$(TIMEOUT_PROGRAM)\" \ -e config.exeext=\"$(exeext)\" \ -e config.top=\"$(FPTOOLS_TOP_ABS)/testsuite\" \ $(EXTRA_RUNTEST_OPTS) @@ -130,9 +130,11 @@ WAY = all :: test -timeout : $(TOP)/timeout/timeout$(exeext) +TIMEOUT_PROGRAM = $(TOP)/timeout/install-inplace/bin/timeout$(exeext) -$(TOP)/timeout/timeout$(exeext) : +timeout : $(TIMEOUT_PROGRAM) + +$(TIMEOUT_PROGRAM) : @echo "Looks like you don't have timeout, building it first..." cd $(TOP)/timeout && $(MAKE) $(MFLAGS) all |