Merge branch 'master' into d3d10

[apitrace] / scripts / retracediff.py

diff --git a/scripts/retracediff.py b/scripts/retracediff.py
index 1b2d2eb81d8dcd5e8269fffba7a89a24c8991920..0b6a3b09f5713402b8ae8d249891ed31c7d76b5c 100755 (executable)
--- a/scripts/retracediff.py
+++ b/scripts/retracediff.py
@@ -30,16 +30,14 @@
 
 import optparse
 import os.path
-import re
-import shutil
 import subprocess
 import platform
 import sys
-import tempfile
 
 from PIL import Image
 
 from snapdiff import Comparer
+from highlight import Highlighter
 import jsondiff
 
 
@@ -75,7 +73,18 @@ class Setup:
         p = subprocess.Popen(cmd, env=self.env, stdout=subprocess.PIPE, stderr=NULL)
         state = jsondiff.load(p.stdout)
         p.wait()
-        return state
+        return state.get('parameters', {})
+
+    def diff_state(self, ref_call_no, src_call_no):
+        '''Compare the state between two calls.'''
+
+        ref_state = self.dump_state(ref_call_no)
+        src_state = self.dump_state(src_call_no)
+
+        sys.stdout.flush()
+        differ = jsondiff.Differ(sys.stdout)
+        differ.visit(ref_state, src_state)
+        sys.stdout.write('\n')
 
 
 def read_pnm(stream):
@@ -98,17 +107,6 @@ def read_pnm(stream):
     return image, comment
 
 
-def diff_state(setup, ref_call_no, src_call_no):
-    '''Compare the state between two calls.'''
-
-    ref_state = setup.dump_state(ref_call_no)
-    src_state = setup.dump_state(src_call_no)
-    sys.stdout.flush()
-    differ = jsondiff.Differ(sys.stdout)
-    differ.visit(ref_state, src_state)
-    sys.stdout.write('\n')
-
-
 def parse_env(optparser, entries):
     '''Translate a list of NAME=VALUE entries into an environment dictionary.'''
 
@@ -166,10 +164,12 @@ def main():
     ref_setup = Setup(args, ref_env)
     src_setup = Setup(args, src_env)
 
-    image_re = re.compile('^Wrote (.*\.png)$')
+    highligher = Highlighter(sys.stdout)
+
+    highligher.write('call\tprecision\n')
 
-    last_good = -1
     last_bad = -1
+    last_good = 0
     ref_proc = ref_setup.retrace()
     try:
         src_proc = src_setup.retrace()
@@ -193,9 +193,16 @@ def main():
                 comparer = Comparer(ref_image, src_image)
                 precision = comparer.precision()
 
-                sys.stdout.write('%u %f\n' % (call_no, precision))
+                mismatch = precision < options.threshold
+
+                if mismatch:
+                    highligher.color(highligher.red)
+                    highligher.bold()
+                highligher.write('%u\t%f\n' % (call_no, precision))
+                if mismatch:
+                    highligher.normal()
 
-                if precision < options.threshold:
+                if mismatch:
                     if options.diff_prefix:
                         prefix = os.path.join(options.diff_prefix, '%010u' % call_no)
                         prefix_dir = os.path.dirname(prefix)
@@ -205,12 +212,12 @@ def main():
                         src_image.save(prefix + '.src.png')
                         comparer.write_diff(prefix + '.diff.png')
                     if last_bad < last_good:
-                        diff_state(src_setup, last_good, call_no)
+                        src_setup.diff_state(last_good, call_no)
                     last_bad = call_no
                 else:
                     last_good = call_no
 
-                sys.stdout.flush()
+                highligher.flush()
         finally:
             src_proc.terminate()
     finally: