X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=app_driver.py;h=ce3b1c43ca3dc16a7f6e041d78c2908754e04e5a;hp=2c7a319a5d556b7006711a70cd0464c4793dc35a;hb=77cd7db1b4deb6f373d708054fced68a9709e9a6;hpb=799a2cd3f002cb517b0c461ee0cb9feb31dc5761

diff --git a/app_driver.py b/app_driver.py
index 2c7a319..ce3b1c4 100755
--- a/app_driver.py
+++ b/app_driver.py
@@ -167,7 +167,7 @@ class AppDriver(Driver):
 
         p = popen(self.cmd, cwd=self.cwd)
         p.wait()
-        if p.returncode:
+        if p.returncode != 0:
             skip('application returned code %i' % p.returncode)
 
     api_trace_map = {
@@ -175,7 +175,13 @@ class AppDriver(Driver):
         'egl_gl': 'egl',
         'egl_gles1': 'egl',
         'egl_gles2': 'egl',
+        'd3d7': 'd3d7',
+        'd3d8': 'd3d8',
         'd3d9': 'd3d9',
+        'd3d10': 'd3d10',
+        'd3d10_1': 'd3d10_1',
+        'd3d11': 'd3d11',
+        'd3d11_1': 'd3d11',
     }
 
     api_retrace_map = {
@@ -220,6 +226,8 @@ class AppDriver(Driver):
 
         p = popen(cmd, env=env, cwd=self.cwd)
         p.wait()
+        if p.returncode != 0:
+            fail('`apitrace trace` returned code %i' % p.returncode)
 
         if not os.path.exists(self.trace_file):
             fail('no trace file generated\n')
@@ -236,6 +244,9 @@ class AppDriver(Driver):
 
         self.doubleBuffer = checker.doubleBuffer
 
+        if self.api not in self.api_retrace_map:
+            return
+
         for callNo, refImageFileName in checker.images:
             self.checkImage(callNo, refImageFileName)
         for callNo, refStateFileName in checker.states:
@@ -302,6 +313,9 @@ class AppDriver(Driver):
         open(filename, 'wt').write(s)
 
     def retrace(self):
+        if self.api not in self.api_retrace_map:
+            return
+
         p = self._retrace()
         p.wait()
         if p.returncode != 0: