X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=driver.py;h=f909a45c65a515da0b2a15ac8fa3cc5f9a88a2f4;hb=3386fbd0792fa8810fbef8aa1903bdc089d0d4ef;hp=8c7d1268bb61e9e2fc2a1b5fe82d14f1f5209979;hpb=956433aa964937908b070c5f0ce9d8465e3751da;p=apitrace-tests

diff --git a/driver.py b/driver.py
index 8c7d126..f909a45 100755
--- a/driver.py
+++ b/driver.py
@@ -87,6 +87,13 @@ class TestCase:
         if p.returncode:
             self.skip('application returned code %i' % p.returncode)
 
+    api_map = {
+        'gl': 'gl',
+        'egl_gl': 'egl',
+        'egl_gles1': 'egl',
+        'egl_gles2': 'egl',
+    }
+
     def trace(self):
         if self.trace_file is None:
             self.trace_file = os.path.abspath(os.path.join(self.results, self.name + '.trace'))
@@ -111,7 +118,7 @@ class TestCase:
             apitrace = _get_build_program('apitrace')
             cmd = [
                 apitrace, 'trace', 
-                '--api', self.api,
+                '--api', self.api_map[self.api],
                 '--output', self.trace_file,
                 '--'
             ] + cmd
@@ -145,8 +152,8 @@ class TestCase:
             ref_line = ref.readline().rstrip()
         for line in p.stdout:
             line = line.rstrip()
+	    print line
             mo = self.call_re.match(line)
-            assert mo
             if mo:
                 call_no = int(mo.group(1))
                 function_name = mo.group(2)
@@ -155,13 +162,15 @@ class TestCase:
                 if function_name in ('glFlush', 'glFinish'):
                     flushes += 1
                 src_line = line[mo.start(2):]
-                if ref_line:
-                    if src_line == ref_line:
-                        sys.stdout.write(src_line + '\n')
-                        ref_line = ref.readline().rstrip()
-                        src_lines = []
-                    else:
-                        src_lines.append(src_line)
+            else:
+                src_line = line
+            if ref_line:
+                if src_line == ref_line:
+                    sys.stdout.write(src_line + '\n')
+                    ref_line = ref.readline().rstrip()
+                    src_lines = []
+                else:
+                    src_lines.append(src_line)
 
         p.wait()
         if p.returncode != 0: