summaryrefslogtreecommitdiff
path: root/testsuite/mk
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2009-11-24 10:12:23 +0000
committerSimon Marlow <marlowsd@gmail.com>2009-11-24 10:12:23 +0000
commit90e99343b38daf645925b460e93b53252a2b5d49 (patch)
tree5274a9bfbf392b63f5bc9fd5e147472f95119440 /testsuite/mk
parent0fb72c5a2a029a57a0f330610d9eb990e4ccca09 (diff)
downloadhaskell-90e99343b38daf645925b460e93b53252a2b5d49.tar.gz
grab the target architecture from GHC, and add an if_arch() test
Diffstat (limited to 'testsuite/mk')
-rw-r--r--testsuite/mk/test.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index 85367433b3..36756d70ae 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -30,6 +30,7 @@ RUNTEST_OPTS =
$(eval $(call get-ghc-rts-field,WORDSIZE,Word size))
$(eval $(call get-ghc-rts-field,TARGETPLATFORM,Target platform))
$(eval $(call get-ghc-rts-field,TargetOS_CPP,Target OS))
+$(eval $(call get-ghc-rts-field,TargetARCH_CPP,Target architecture))
ifeq "$(filter $(TargetOS_CPP), cygwin32 mingw32)" ""
exeext =
else
@@ -106,6 +107,7 @@ RUNTEST_OPTS += \
-e 'config.gs="$(GS)"' \
-e 'config.platform="$(TARGETPLATFORM)"' \
-e 'config.os="$(TargetOS_CPP)"' \
+ -e 'config.arch="$(TargetARCH_CPP)"' \
-e 'config.wordsize="$(WORDSIZE)"' \
-e 'default_testopts.cleanup="$(CLEANUP)"' \
-e 'config.timeout=int($(TIMEOUT)) or config.timeout' \