Commit 99674079 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

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
parent a138c04a
...@@ -134,3 +134,10 @@ CP = cp ...@@ -134,3 +134,10 @@ CP = cp
RM = rm -f RM = rm -f
PYTHON = python PYTHON = python
$(eval $(call get-ghc-rts-field,HostOS,Host OS))
ifeq "$(HostOS)" "mingw32"
WINDOWS = YES
else
WINDOWS = NO
endif
...@@ -19,7 +19,10 @@ ifneq "$(GCC)" "" ...@@ -19,7 +19,10 @@ ifneq "$(GCC)" ""
WITH_GCC = --with-gcc='$(GCC)' WITH_GCC = --with-gcc='$(GCC)'
endif 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 $(TIMEOUT_PROGRAM): timeout.py
rm -rf install-inplace rm -rf install-inplace
mkdir install-inplace mkdir install-inplace
...@@ -27,6 +30,8 @@ $(TIMEOUT_PROGRAM): timeout.py ...@@ -27,6 +30,8 @@ $(TIMEOUT_PROGRAM): timeout.py
cp $< $@ cp $< $@
chmod +x $@ chmod +x $@
else else
# The python timeout program doesn't work on mingw, so we still use the
# Haskell program on Windows
$(TIMEOUT_PROGRAM): timeout.hs $(TIMEOUT_PROGRAM): timeout.hs
rm -rf install-inplace rm -rf install-inplace
'$(TEST_HC)' --make Setup '$(TEST_HC)' --make Setup
......
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