summaryrefslogtreecommitdiff
path: root/testsuite/driver
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-02-13 17:08:52 +0000
committerIan Lynagh <ian@well-typed.com>2013-02-13 17:08:52 +0000
commita848c40e7264efa0e657944a8923784de3eb0de9 (patch)
treeadd90a312feb905a73ea3c032c2686a187eb3010 /testsuite/driver
parentfdc6e903721e2c6ffb604af5c9837e35e381fec9 (diff)
downloadhaskell-a848c40e7264efa0e657944a8923784de3eb0de9.tar.gz
Reorder some functions to group them
Predicates now match the order they are documented on the wiki
Diffstat (limited to 'testsuite/driver')
-rw-r--r--testsuite/driver/testlib.py35
1 files changed, 17 insertions, 18 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 56e1b4604c..de8ab90122 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -304,12 +304,15 @@ def when(b, f):
def unless(b, f):
return when(not b, f)
-def fast():
- return config.fast
-
def doing_ghci():
return 'ghci' in config.run_ways
+def ghci_dynamic( ):
+ return config.ghc_dynamic_by_default
+
+def fast():
+ return config.fast
+
def platform( plat ):
return config.platform == plat
@@ -322,9 +325,6 @@ def arch( arch ):
def wordsize( ws ):
return config.wordsize == str(ws)
-def unregisterised( ):
- return config.unregisterised
-
def msys( ):
return config.msys
@@ -340,20 +340,12 @@ def have_dynamic( ):
def have_profiling( ):
return config.have_profiling
-# ---
-
-def ghci_dynamic( ):
- return config.ghc_dynamic_by_default
-
def in_tree_compiler( ):
return config.in_tree_compiler
def compiler_type( compiler ):
return config.compiler_type == compiler
-def compiler_profiled( ):
- return config.compiler_profiled
-
def compiler_lt( compiler, version ):
return config.compiler_type == compiler and \
version_lt(config.compiler_version, version)
@@ -370,9 +362,20 @@ def compiler_ge( compiler, version ):
return config.compiler_type == compiler and \
version_ge(config.compiler_version, version)
+def unregisterised( ):
+ return config.unregisterised
+
+def compiler_profiled( ):
+ return config.compiler_profiled
+
def compiler_debugged( ):
return config.compiler_debugged
+def tag( t ):
+ return t in config.compiler_tags
+
+# ---
+
def namebase( nb ):
return lambda opts, nb=nb: _namebase(opts, nb)
@@ -381,10 +384,6 @@ def _namebase( opts, nb ):
# ---
-def tag( t ):
- return t in config.compiler_tags
-
-# ---
def high_memory_usage(name, opts):
opts.alone = True