apitrace diff-images: Print one line for each file being compared.

This is important so that the test suite can verify that "apitrace
diff-images" is actually doing something. The tricky case is when no
images are found to compare. In this case, diff-images exits with
value 0, (no differences), which is valid, but the test suite wants to
know that no comparison happened since that's unexpected, (and should
flag a failure in the test suite).

Signed-off-by: José Fonseca <jose.r.fonseca@gmail.com>

diff --git a/scripts/snapdiff.py b/scripts/snapdiff.py
index 7ae3a433fa125724f83c82548bbff4da9e7886c8..689898512acd75ff1e23b06ce2af2f5b09352d24 100755 (executable)
--- a/scripts/snapdiff.py
+++ b/scripts/snapdiff.py
@@ -154,6 +154,10 @@ def main():
 
     optparser = optparse.OptionParser(
         usage="\n\t%prog [options] <ref_prefix> <src_prefix>")
+    optparser.add_option(
+        '-v', '--verbose',
+        action="store_true", dest="verbose", default=False,
+        help="verbose output")
     optparser.add_option(
         '-o', '--output', metavar='FILE',
         type="string", dest="output", default='index.html',
@@ -203,14 +207,19 @@ def main():
         root, ext = os.path.splitext(src_image)
         delta_image = "%s.diff.png" % (root, )
         if os.path.exists(ref_image) and os.path.exists(src_image):
-            print "Comparing %s and %s\n" % (ref_image, src_image)
+            if options.verbose:
+                sys.stdout.write('Comparing %s and %s ...' % (ref_image, src_image))
             comparer = Comparer(ref_image, src_image, options.alpha)
             match = comparer.ae(fuzz=options.fuzz) == 0
             if match:
+                result = 'MATCH'
                 bgcolor = '#20ff20'
             else:
+                result = 'MISMATCH'
                 failures += 1
                 bgcolor = '#ff2020'
+            if options.verbose:
+                sys.stdout.write(' %s\n' % (result,))
             html.write('      <tr>\n')
             html.write('        <td bgcolor="%s"><a href="%s">%s<a/></td>\n' % (bgcolor, ref_image, image))
             if not match or options.show_all: