actually call adjustRefState.

[apitrace-tests] / driver.py

diff --git a/driver.py b/driver.py
index 9894c9c80447cc806401361b9bf497b8fc4267ab..4f40ac4ba85140dbf853aa5cfc13c349e9053793 100755 (executable)
--- a/driver.py
+++ b/driver.py
@@ -243,7 +243,13 @@ class TestCase:
             return
 
         if self.trace_file is None:
-            name, ext = os.path.splitext(os.path.basename(self.cmd[0]))
+            if self.ref_dump is not None:
+                name = self.ref_dump
+            else:
+                name = self.cmd[0]
+            name, ext = os.path.splitext(os.path.basename(name))
+            while ext:
+                name, ext = os.path.splitext(os.path.basename(name))
             self.trace_file = os.path.abspath(os.path.join(self.results, name + '.trace'))
         if os.path.exists(self.trace_file):
             os.remove(self.trace_file)
@@ -337,6 +343,7 @@ class TestCase:
         stream = open(refStateFileName, 'rt')
         from jsondiff import load
         state = load(stream)
+        self.adjustRefState(state)
         return state
 
     def getNamePrefix(self):
@@ -434,7 +441,7 @@ class TestCase:
         except KeyError:
             return
 
-        if platform.system() == 'Darwin' or True:
+        if platform.system() == 'Darwin':
             # Mac OS X drivers fail on GL_COLOR_SUM
             # XXX: investigate this
             self.removeState(parameters, 'GL_COLOR_SUM')