diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-10-25 15:54:24 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-10-25 15:54:24 +0000 |
| commit | 99674079a5f3f9bdeb900202e11cf2aef70feda3 (patch) | |
| tree | 77ef0c58ef50940083565494c7bcb680d17c1353 | |
| parent | a138c04af52f642c30ad40fa4585ef6ed4183d82 (diff) | |
| download | haskell-99674079a5f3f9bdeb900202e11cf2aef70feda3.tar.gz | |
Always use the python timeout program on non-Windows
Use a python timeout program, so that we don't have to worry about
whether or not the compiler we're testing has built the timeout
program correctly
The python timeout program doesn't work on mingw, so we still use the
Haskell program on Windows
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 7 | ||||
| -rw-r--r-- | testsuite/timeout/Makefile | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index 72087713cb..ec3a284d0c 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -134,3 +134,10 @@ CP = cp RM = rm -f PYTHON = python +$(eval $(call get-ghc-rts-field,HostOS,Host OS)) +ifeq "$(HostOS)" "mingw32" +WINDOWS = YES +else +WINDOWS = NO +endif + diff --git a/testsuite/timeout/Makefile b/testsuite/timeout/Makefile index 7fa6e25fa4..8c2d956b9a 100644 --- a/testsuite/timeout/Makefile +++ b/testsuite/timeout/Makefile @@ -19,7 +19,10 @@ ifneq "$(GCC)" "" WITH_GCC = --with-gcc='$(GCC)' endif -ifeq "$(filter thr, $(GhcRTSWays))" "" +ifeq "$(WINDOWS)" "NO" +# Use a python timeout program, so that we don't have to worry about +# whether or not the compiler we're testing has built the timeout +# program correctly $(TIMEOUT_PROGRAM): timeout.py rm -rf install-inplace mkdir install-inplace @@ -27,6 +30,8 @@ $(TIMEOUT_PROGRAM): timeout.py cp $< $@ chmod +x $@ else +# The python timeout program doesn't work on mingw, so we still use the +# Haskell program on Windows $(TIMEOUT_PROGRAM): timeout.hs rm -rf install-inplace '$(TEST_HC)' --make Setup |