Convert more helper functions to the new scheme

2 files changed, 8 insertions, 35 deletions

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 51e18be8f9..6f6ab4a251 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -337,41 +337,14 @@ def msys( ):
 def cygwin( ):
     return config.cygwin
 
-def when_have_vanilla( f ):
-    if config.have_vanilla:
-        return f
-    else:
-        return normal
+def have_vanilla( ):
+    return config.have_vanilla
 
-def unless_have_vanilla( f ):
-    if config.have_vanilla:
-        return normal
-    else:
-        return f
+def have_dynamic( ):
+    return config.have_dynamic
 
-def when_have_dynamic( f ):
-    if config.have_dynamic:
-        return f
-    else:
-        return normal
-
-def unless_have_dynamic( f ):
-    if config.have_dynamic:
-        return normal
-    else:
-        return f
-
-def when_have_profiling( f ):
-    if config.have_profiling:
-        return f
-    else:
-        return normal
-
-def unless_have_profiling( f ):
-    if config.have_profiling:
-        return normal
-    else:
-        return f
+def have_profiling( ):
+    return config.have_profiling
 
 # ---
 
diff --git a/testsuite/tests/driver/dynamicToo/all.T b/testsuite/tests/driver/dynamicToo/all.T
index 25d48b05fb..6465d1e1fb 100644
--- a/testsuite/tests/driver/dynamicToo/all.T
+++ b/testsuite/tests/driver/dynamicToo/all.T
@@ -7,8 +7,8 @@ test('dynamicToo001',
                    'A001.dyn_hi', 'B001.dyn_hi', 'C001.dyn_hi',
                    's001', 'd001']),
       when(opsys('mingw32'), expect_broken(7665)),
-      unless_have_vanilla(skip),
-      unless_have_dynamic(skip)],
+      unless(have_vanilla(), skip),
+      unless(have_dynamic(), skip)],
      run_command,
      ['$MAKE -s --no-print-directory dynamicToo001'])