Convert more helpers

2 files changed, 3 insertions, 12 deletions

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 942a7222ec..7fcdaefe8e 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -387,17 +387,8 @@ def _namebase( opts, nb ):
 
 # ---
 
-def if_tag( tag, f ):
-    if tag in config.compiler_tags:
-        return f
-    else:
-        return normal
-
-def unless_tag( tag, f ):
-    if not (tag in config.compiler_tags):
-        return f
-    else:
-        return normal
+def tag( t ):
+    return t in config.compiler_tags
 
 # ---
 def high_memory_usage(name, opts):
diff --git a/testsuite/tests/esc/all.T b/testsuite/tests/esc/all.T
index 55b21ee2a3..31a4ba5254 100644
--- a/testsuite/tests/esc/all.T
+++ b/testsuite/tests/esc/all.T
@@ -1,4 +1,4 @@
-esc = unless_tag('esc', skip)
+esc = unless(tag('esc'), skip)
 
 test('TestList', esc, compile, ['-fesc'])
 test('TestImport', esc, compile, ['-fesc'])