diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-04-06 00:10:33 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-04-06 00:10:33 +0000 |
| commit | ca1ec90795b387ca43e20656ac36639094d33d76 (patch) | |
| tree | 232184c8e533b91c40ccfb9646a1fc50c2575984 /testsuite/timeout | |
| parent | c861ac0137fdea42a9e5cc369f0d2e65d0a8fc44 (diff) | |
| download | haskell-ca1ec90795b387ca43e20656ac36639094d33d76.tar.gz | |
Calibrate == calibrate on Windows...
Diffstat (limited to 'testsuite/timeout')
| -rw-r--r-- | testsuite/timeout/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/timeout/TimeMe.hs (renamed from testsuite/timeout/Calibrate.hs) | 0 | ||||
| -rw-r--r-- | testsuite/timeout/calibrate | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/timeout/Makefile b/testsuite/timeout/Makefile index 6d2b4dd861..d93c6a47fb 100644 --- a/testsuite/timeout/Makefile +++ b/testsuite/timeout/Makefile @@ -4,7 +4,7 @@ include $(TOP)/mk/boilerplate.mk HC = $(GHC_INPLACE) MKDEPENDHS = $(GHC_INPLACE) SRC_HC_OPTS += -threaded -EXCLUDED_SRCS += Calibrate.hs +EXCLUDED_SRCS += TimeMe.hs ifeq "$(Windows)" "NO" SRC_HC_OPTS += -package unix @@ -21,7 +21,7 @@ boot :: python-timeout endif calibrate.out: - rm -f Calibrate.o Calibrate.hi Calibrate + rm -f TimeMe.o TimeMe.hi TimeMe $(PYTHON) calibrate "$(HC)" > $@ python-timeout: diff --git a/testsuite/timeout/Calibrate.hs b/testsuite/timeout/TimeMe.hs index 77f60ecdef..77f60ecdef 100644 --- a/testsuite/timeout/Calibrate.hs +++ b/testsuite/timeout/TimeMe.hs diff --git a/testsuite/timeout/calibrate b/testsuite/timeout/calibrate index c4bdba64f8..4ebd07ae7c 100644 --- a/testsuite/timeout/calibrate +++ b/testsuite/timeout/calibrate @@ -10,8 +10,8 @@ compiler = argv[1] compiler_name = os.path.basename(compiler) spawnl(os.P_WAIT, compiler, - compiler_name, 'Calibrate.hs', '-o', 'Calibrate', '-O2') -spawnl(os.P_WAIT, './Calibrate', 'Calibrate') + compiler_name, 'TimeMe.hs', '-o', 'TimeMe', '-O2') +spawnl(os.P_WAIT, './TimeMe', 'TimeMe') xs = getrusage(RUSAGE_CHILDREN); print (300*int(math.ceil(xs[0] + xs[1]))) |