[Piglit] [PATCH 04/24] all.py: change add_plain and add_concurrent to use list

Dylan Baker baker.dylan.c at gmail.com
Mon Jan 5 13:50:25 PST 2015


Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/all.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index 458cf09..e04c625 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -31,13 +31,18 @@ def add_single_param_test_set(group, name, *params):
     for param in params:
         group[name + '-' + param] = PiglitGLTest(name + ' ' + param)
 
-def add_plain_test(group, args):
-    assert '/' not in args, args
-    group[args] = PiglitGLTest(args)
+def add_plain_test(group, args, **kwargs):
+    for a in args:
+        if isinstance(a, basestring):
+            assert '/' not in a, args
+
+    gname = ' '.join(args) 
+    assert not gname.startswith('/')
+
+    group[gname] = PiglitGLTest(args, **kwargs)
 
 def add_concurrent_test(group, args):
-    assert '/' not in args, args
-    group[args] = PiglitGLTest(args, run_concurrent=True)
+    add_plain_test(group, args, run_concurrent=True)
 
 # Generate all possible subsets of the given set, including the empty set.
 def power_set(s):
-- 
2.2.1



More information about the Piglit mailing list