More helper conversions

8 files changed, 19 insertions, 12 deletions

diff --git a/testsuite/tests/driver/dynamic_flags_001/all.T b/testsuite/tests/driver/dynamic_flags_001/all.T
index c487a0cb75..19ed656e7f 100644
--- a/testsuite/tests/driver/dynamic_flags_001/all.T
+++ b/testsuite/tests/driver/dynamic_flags_001/all.T
@@ -1,5 +1,5 @@
 test('dynamic_flags_001',
-     [skip_if_fast,
+     [when(fast(), skip),
       clean_cmd('$MAKE -s clean')],
      run_command,
      ['$MAKE -s --no-print-directory dynamic_flags_001'])
diff --git a/testsuite/tests/driver/dynamic_flags_002/all.T b/testsuite/tests/driver/dynamic_flags_002/all.T
index 3b0072ba6b..e5a4a564fa 100644
--- a/testsuite/tests/driver/dynamic_flags_002/all.T
+++ b/testsuite/tests/driver/dynamic_flags_002/all.T
@@ -1,6 +1,12 @@
-test('dynamic_flags_002A', skip_if_fast, multimod_compile, ['A_Main', '-v0'])
-test('dynamic_flags_002B', skip_if_fast, multimod_compile, ['B_Main', '-v0'])
-test('dynamic_flags_002C', skip_if_fast, multimod_compile, ['C_Main', '-v0'])
-test('dynamic_flags_002D', skip_if_fast, multimod_compile, ['D_Main', '-v0'])
-test('dynamic_flags_002Many', skip_if_fast, multimod_compile, ['ManyFirst ManySecond ManyThird', '-v0'])
+test('dynamic_flags_002A',
+     when(fast(), skip), multimod_compile, ['A_Main', '-v0'])
+test('dynamic_flags_002B',
+     when(fast(), skip), multimod_compile, ['B_Main', '-v0'])
+test('dynamic_flags_002C',
+     when(fast(), skip), multimod_compile, ['C_Main', '-v0'])
+test('dynamic_flags_002D',
+     when(fast(), skip), multimod_compile, ['D_Main', '-v0'])
+test('dynamic_flags_002Many',
+     when(fast(), skip), multimod_compile,
+     ['ManyFirst ManySecond ManyThird', '-v0'])
 
diff --git a/testsuite/tests/driver/recomp001/all.T b/testsuite/tests/driver/recomp001/all.T
index f3672fa2f8..33202d6241 100644
--- a/testsuite/tests/driver/recomp001/all.T
+++ b/testsuite/tests/driver/recomp001/all.T
@@ -1,5 +1,5 @@
 test('recomp001',
-     [skip_if_fast,
+     [when(fast(), skip),
       clean_cmd('$MAKE -s clean')],
      run_command,
      ['$MAKE -s --no-print-directory recomp001'])
diff --git a/testsuite/tests/driver/recomp002/all.T b/testsuite/tests/driver/recomp002/all.T
index 5f8ddf5f1b..68f1a7967e 100644
--- a/testsuite/tests/driver/recomp002/all.T
+++ b/testsuite/tests/driver/recomp002/all.T
@@ -1,5 +1,5 @@
 test('recomp002',
-     [skip_if_fast,
+     [when(fast(), skip),
       clean_cmd('$MAKE -s clean')],
      run_command,
      ['$MAKE -s --no-print-directory recomp002'])
diff --git a/testsuite/tests/driver/recomp005/all.T b/testsuite/tests/driver/recomp005/all.T
index d5d89b1712..5282c5b685 100644
--- a/testsuite/tests/driver/recomp005/all.T
+++ b/testsuite/tests/driver/recomp005/all.T
@@ -1,5 +1,5 @@
 test('recomp005',
-     [skip_if_fast,
+     [when(fast(), skip),
       clean_cmd('$MAKE -s clean')],
      run_command, ['$MAKE -s --no-print-directory recomp005'])
 
diff --git a/testsuite/tests/driver/recomp006/all.T b/testsuite/tests/driver/recomp006/all.T
index bc4f915bad..f234e58e87 100644
--- a/testsuite/tests/driver/recomp006/all.T
+++ b/testsuite/tests/driver/recomp006/all.T
@@ -1,3 +1,4 @@
 test('recomp006',
-     [ skip_if_fast, extra_clean(['A.o','A.hi','B.o','B.hi','err','out']) ],
+     [ when(fast(), skip),
+       extra_clean(['A.o','A.hi','B.o','B.hi','err','out']) ],
      run_command, ['$MAKE -s --no-print-directory recomp006'])
diff --git a/testsuite/tests/driver/recomp007/all.T b/testsuite/tests/driver/recomp007/all.T
index 5a93a12d68..de562b6277 100644
--- a/testsuite/tests/driver/recomp007/all.T
+++ b/testsuite/tests/driver/recomp007/all.T
@@ -3,7 +3,7 @@
 #   "Fix a recompilation checking bug when a package dependency changes"
 
 test('recomp007',
-     [ skip_if_fast, clean_cmd('$MAKE -s clean'), normalise_slashes ],
+     [ when(fast(), skip), clean_cmd('$MAKE -s clean'), normalise_slashes ],
      run_command,
      ['$MAKE -s --no-print-directory recomp007'])
 
diff --git a/testsuite/tests/driver/recomp008/all.T b/testsuite/tests/driver/recomp008/all.T
index a59b1512e0..caf81d5ba9 100644
--- a/testsuite/tests/driver/recomp008/all.T
+++ b/testsuite/tests/driver/recomp008/all.T
@@ -1,7 +1,7 @@
 # Test for #4469, a recompilation bug related to instances
 
 test('recomp008',
-     [ skip_if_fast, clean_cmd('$MAKE -s clean'), normalise_slashes ],
+     [ when(fast(), skip), clean_cmd('$MAKE -s clean'), normalise_slashes ],
      run_command,
      ['$MAKE -s --no-print-directory recomp008'])