Test trimming.

[apitrace-tests] / app_driver.py

diff --git a/app_driver.py b/app_driver.py
index 8dd7b5e782dbff73b96d163ecb9ba44789799f47..ce3b1c43ca3dc16a7f6e041d78c2908754e04e5a 100755 (executable)
--- 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 = {
@@ -179,6 +179,9 @@ class AppDriver(Driver):
         'd3d8': 'd3d8',
         'd3d9': 'd3d9',
         'd3d10': 'd3d10',
+        'd3d10_1': 'd3d10_1',
+        'd3d11': 'd3d11',
+        'd3d11_1': 'd3d11',
     }
 
     api_retrace_map = {
@@ -223,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')