Permalink
Browse files

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>
  • Loading branch information...
1 parent d2d7112 commit cbabe34c0bc4c5190f53c2b4e6991ad10ad36e44 @cworth-gh cworth-gh committed with jrfonseca Apr 9, 2012
Showing with 10 additions and 1 deletion.
  1. +10 −1 scripts/snapdiff.py
View
@@ -155,6 +155,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',
help="output filename [default: %default]")
@@ -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:

0 comments on commit cbabe34

Please sign in to comment.