X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=driver.py;h=48b04ece6a355f021ee27592b660aecd687b44d6;hb=8d2d0a6eda093ec8f20a8b8b7ea7fc50d0e02b26;hp=7799b6587693f7d1db058c83a1fcaf5bd684e286;hpb=5cde484f5bded377ca859164aa6919b0cbe3e7d8;p=apitrace-tests

diff --git a/driver.py b/driver.py
index 7799b65..48b04ec 100755
--- a/driver.py
+++ b/driver.py
@@ -31,6 +31,7 @@ import optparse
 import os.path
 import platform
 import re
+import shutil
 import subprocess
 import sys
 import time
@@ -56,6 +57,11 @@ def _get_build_path(path):
         sys.exit(1)
     return path
 
+def _get_build_program(program):
+    if platform.system() == 'Windows':
+        program += '.exe'
+    return _get_build_path(program)
+
 
 class TestCase:
 
@@ -94,10 +100,11 @@ class TestCase:
         env = os.environ.copy()
         
         system = platform.system()
+        local_wrapper = None
         if system == 'Windows':
-            # TODO
-            self.skip('tracing not supported on Windows')
             wrapper = _get_build_path('wrappers/opengl32.dll')
+            local_wrapper = os.path.join(os.path.dirname(self.args[0]), os.path.basename(wrapper))
+            shutil.copy(wrapper, local_wrapper)
         elif system == 'Darwin':
             wrapper = _get_build_path('wrappers/OpenGL')
             env['DYLD_LIBRARY_PATH'] = os.path.dirname(wrapper)
@@ -109,8 +116,12 @@ class TestCase:
         if self.max_frames is not None:
             env['TRACE_FRAMES'] = str(self.max_frames)
 
-        p = popen(self.args, env=env, cwd=self.cwd)
-        p.wait()
+        try:
+            p = popen(self.args, env=env, cwd=self.cwd)
+            p.wait()
+        finally:
+            if local_wrapper is not None:
+                os.remove(local_wrapper)
 
         if not os.path.exists(self.trace_file):
             self.fail('no trace file generated\n')
@@ -119,7 +130,7 @@ class TestCase:
 
     def dump(self):
 
-        cmd = [_get_build_path('tracedump'), '--color=never', self.trace_file]
+        cmd = [_get_build_program('tracedump'), '--color=never', self.trace_file]
         p = popen(cmd, stdout=subprocess.PIPE)
 
         swapbuffers = 0
@@ -141,15 +152,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()