[Piglit] [PATCH 04/10] glsl_parser_test.py: use grouptools

Dylan Baker baker.dylan.c at gmail.com
Thu Dec 4 15:10:01 PST 2014


Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 framework/test/glsl_parser_test.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/framework/test/glsl_parser_test.py b/framework/test/glsl_parser_test.py
index 2c48888..d7aebd4 100644
--- a/framework/test/glsl_parser_test.py
+++ b/framework/test/glsl_parser_test.py
@@ -27,6 +27,7 @@ import os.path as path
 import re
 import sys
 
+import framework.grouptools as grouptools
 from .piglit_test import PiglitBaseTest
 
 __all__ = [
@@ -66,10 +67,8 @@ def import_glsl_parser_tests(group, basepath, subdirectories):
                     filepath = path.join(dirpath, f)
                     # testname := filepath relative to
                     # basepath.
-                    testname = os.path.relpath(filepath, basepath)
-                    if os.path.sep != '/':
-                        testname = testname.replace(os.path.sep, '/', -1)
-                    assert isinstance(testname, basestring)
+                    testname = grouptools.from_path(
+                        os.path.relpath(filepath, basepath))
                     add_glsl_parser_test(group, filepath, testname)
 
 
-- 
2.2.0



More information about the Piglit mailing list