Convert more helpers to the new scheme
authorIan Lynagh <ian@well-typed.com>
Mon, 11 Feb 2013 14:08:58 +0000 (14:08 +0000)
committerIan Lynagh <ian@well-typed.com>
Mon, 11 Feb 2013 14:08:58 +0000 (14:08 +0000)
testsuite/driver/testlib.py
testsuite/tests/driver/all.T

index 02c7ba3..51e18be 100644 (file)
@@ -328,29 +328,14 @@ def arch( arch ):
 def wordsize( ws ):
     return config.wordsize == str(ws)
 
-def if_unregisterised( f ):
-    if config.unregisterised:
-        return f
-    else:
-        return normal
+def unregisterised( ):
+    return config.unregisterised
 
-def unless_unregisterised( f ):
-    if config.unregisterised:
-        return normal
-    else:
-        return f
+def msys( ):
+    return config.msys
 
-def if_msys( f ):
-    if config.msys:
-        return f
-    else:
-        return normal
-
-def if_cygwin( f ):
-    if config.cygwin:
-        return f
-    else:
-        return normal
+def cygwin( ):
+    return config.cygwin
 
 def when_have_vanilla( f ):
     if config.have_vanilla:
index 1bf7c7e..0020f18 100644 (file)
@@ -362,6 +362,6 @@ test('T7060',
      run_command,
      ['$MAKE -s --no-print-directory T7060'])
 test('T7130', normal, compile_fail, ['-fflul-laziness'])
-test('T7563', if_unregisterised(skip), run_command,
+test('T7563', when(unregisterised(), skip), run_command,
      ['$MAKE -s --no-print-directory T7563'])