Avoid hacking around argc / argv.

[apitrace] / scripts / retracediff.py

diff --git a/scripts/retracediff.py b/scripts/retracediff.py
index 0b6a3b09f5713402b8ae8d249891ed31c7d76b5c..34959753fc0acf9b137e07394a6e60e621028e9d 100755 (executable)
--- a/scripts/retracediff.py
+++ b/scripts/retracediff.py
@@ -54,23 +54,28 @@ class Setup:
         self.args = args
         self.env = env
 
-    def retrace(self):
+    def _retrace(self, args):
         cmd = [
             options.retrace,
+        ] + args + self.args
+        try:
+            return subprocess.Popen(cmd, env=self.env, stdout=subprocess.PIPE, stderr=NULL)
+        except OSError, ex:
+            sys.stderr.write('error: failed to execute %s: %s\n' % (cmd[0], ex.strerror))
+            sys.exit(1)
+
+    def retrace(self):
+        return self._retrace([
             '-s', '-',
             '-S', options.snapshot_frequency,
-        ] + self.args
-        p = subprocess.Popen(cmd, env=self.env, stdout=subprocess.PIPE, stderr=NULL)
-        return p
+        ])
 
     def dump_state(self, call_no):
         '''Get the state dump at the specified call no.'''
 
-        cmd = [
-            options.retrace,
+        p = self._retrace([
             '-D', str(call_no),
-        ] + self.args
-        p = subprocess.Popen(cmd, env=self.env, stdout=subprocess.PIPE, stderr=NULL)
+        ])
         state = jsondiff.load(p.stdout)
         p.wait()
         return state.get('parameters', {})
@@ -151,9 +156,9 @@ def main():
         type="float", dest="threshold", default=12.0,
         help="threshold precision  [default: %default]")
     optparser.add_option(
-        '-S', '--snapshot-frequency', metavar='FREQUENCY',
+        '-S', '--snapshot-frequency', metavar='CALLSET',
         type="string", dest="snapshot_frequency", default='draw',
-        help="snapshot frequency: frame, framebuffer, or draw  [default: %default]")
+        help="calls to compare [default: %default]")
 
     (options, args) = optparser.parse_args(sys.argv[1:])
     ref_env = parse_env(optparser, options.ref_env)