From cbabe34c0bc4c5190f53c2b4e6991ad10ad36e44 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 9 Apr 2012 13:45:33 -0700 Subject: [PATCH] apitrace diff-images: Print one line for each file being compared. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- scripts/snapdiff.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/snapdiff.py b/scripts/snapdiff.py index 7ae3a43..6898985 100755 --- a/scripts/snapdiff.py +++ b/scripts/snapdiff.py @@ -154,6 +154,10 @@ def main(): optparser = optparse.OptionParser( usage="\n\t%prog [options] ") + 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(' \n') html.write(' %s\n' % (bgcolor, ref_image, image)) if not match or options.show_all: -- 2.43.0