X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=driver.py;h=7f04f2495a8cf3de5a450121692fd9a02793d29c;hb=cbcb20d793b9710b48b1446f256f990eba47ef52;hp=660a1f9b0c70c58e863ec9ebdc2b1b3572c2cce6;hpb=2954c5f9db610158245e908cc54d7494da3487dc;p=apitrace-tests

diff --git a/driver.py b/driver.py
index 660a1f9..7f04f24 100755
--- a/driver.py
+++ b/driver.py
@@ -84,6 +84,12 @@ class TestCase:
     def trace(self):
         if self.trace_file is None:
             self.trace_file = os.path.abspath(os.path.join(self.results, self.name + '.trace'))
+        if os.path.exists(self.trace_file):
+            os.remove(self.trace_file)
+        else:
+            trace_dir = os.path.dirname(self.trace_file)
+            if not os.path.exists(trace_dir):
+                os.makedirs(trace_dir)
 
         env = os.environ.copy()
         
@@ -135,15 +141,15 @@ class TestCase:
                 if function_name in ('glFlush', 'glFinish'):
                     flushes += 1
                 src_line = line[mo.start(2):]
-                sys.stdout.write(src_line + '\n')
                 if ref_line:
                     if src_line == ref_line:
+                        sys.stdout.write(src_line + '\n')
                         ref_line = ref.readline().rstrip()
         p.wait()
         if p.returncode != 0:
             self.fail('tracedump returned code %i' % p.returncode)
         if ref_line:
-            self.fail('missing call %' % ref_line)
+            self.fail('missing call %s' % ref_line)
 
     def run(self):
         self.standalone()