[Piglit] [PATCH 1/2] es3conform.py: Use grouptools instead of os.path

Dylan Baker baker.dylan.c at gmail.com
Mon Mar 23 10:23:10 PDT 2015


This probably would have been fine before since most (all?) users of
es3conform.py used Linux. However, since the separator has changed this
has stopped working, so grouptools is now required.

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

diff --git a/tests/es3conform.py b/tests/es3conform.py
index 20b408b..cde2824 100644
--- a/tests/es3conform.py
+++ b/tests/es3conform.py
@@ -20,14 +20,13 @@
 # OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-import os
 import re
 import sys
-
 from os import path
-from glob import glob
+
 from framework.profile import TestProfile
 from framework.test import TEST_BIN_DIR, Test
+from framework import grouptools
 
 __all__ = ['profile']
 
@@ -79,7 +78,9 @@ def populateTests(runfile):
                 populateTests(newpath)
             else:
                 # Add the .test file
-                group = path.join('es3conform', path.relpath(newpath, gtfroot))
+                group = grouptools.join(
+                    'es3conform',
+                    grouptools.from_path(path.relpath(newpath, gtfroot)))
                 profile.test_list[group] = GTFTest(newpath)
 
 
-- 
2.3.3



More information about the Piglit mailing list