summaryrefslogtreecommitdiff
path: root/testsuite/config
diff options
context:
space:
mode:
authorSimon Marlow <simonmar@microsoft.com>2008-02-06 10:55:10 +0000
committerSimon Marlow <simonmar@microsoft.com>2008-02-06 10:55:10 +0000
commit3bc99c34b8fdc3f891d18159cc3c7722049a2ea9 (patch)
tree6de5faff2a0a6e84e82b27b89e5ee6440884616c /testsuite/config
parentd4da119183a29f957c8c02c6535c5c2f126128c3 (diff)
downloadhaskell-3bc99c34b8fdc3f891d18159cc3c7722049a2ea9.tar.gz
Find compiler version-specific output files automatically
Also, clean up the way we find the output file. From the comment: # Finding the sample output. The filename is of the form # # <test>.stdout[-<compiler>][-<version>][-<wordsize>][-<platform>] # # and we pick the most specific version available. The <version> is # the major version of the compiler (e.g. 6.8.2 would be "6.8"). For # more fine-grained control use if_compiler_lt(). I'll update the wiki too.
Diffstat (limited to 'testsuite/config')
-rw-r--r--testsuite/config/ghc2
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index ddd7ebf1c2..875717ee6e 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -92,5 +92,5 @@ def get_compiler_info():
v = re.sub('[\r\n]', '', v)
v = v.split('-')
config.compiler_version = v[0]
+ config.compiler_maj_version = re.sub('^([0-9]+\.[0-9]+).*',r'\1', v[0])
config.compiler_tags = v[1:]
-