Add fuzzy image matching tool for Linux pixel tests

webkit/tools/layout_tests/run_webkit_tests.py

 #!/bin/env python
 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Run layout tests using the test_shell.
 
 This is a port of the existing webkit test script run-webkit-tests.
 
 The TestRunner class runs a series of tests (TestType interface) against a set
@@ skipping 21 matching lines @@
 import time
 
 import google.path_utils
 
 from layout_package import compare_failures
 from layout_package import test_expectations
 from layout_package import http_server
 from layout_package import path_utils
 from layout_package import test_failures
 from layout_package import test_shell_thread
+from test_types import fuzzy_image_diff
 from test_types import image_diff
 from test_types import test_type_base
 from test_types import text_diff
 from test_types import simplified_text_diff
 
 
 # The test list files are found in this subdirectory, which must be a sibling
 # to this script itself.
 TEST_FILE_DIR = 'test_lists'
 
@@ skipping 539 matching lines @@
     paths += args
   if options.test_list:
     paths += ReadTestFiles(options.test_list)
   if not paths:
     paths = ['.']
   test_runner = TestRunner(options, paths)
   test_runner.AddTestType(text_diff.TestTextDiff)
   test_runner.AddTestType(simplified_text_diff.SimplifiedTextDiff)
   if not options.no_pixel_tests:
     test_runner.AddTestType(image_diff.ImageDiff)
+    if options.fuzzy_pixel_tests:
+      test_runner.AddTestType(fuzzy_image_diff.FuzzyImageDiff)
   has_new_failures = test_runner.Run()
   logging.info("Exit status: %d" % has_new_failures)
   sys.exit(has_new_failures)
 
 if '__main__' == __name__:
   option_parser = optparse.OptionParser()
   option_parser.add_option("", "--no-pixel-tests", action="store_true",
                            default=False,
                            help="disable pixel-to-pixel PNG comparisons")
+  option_parser.add_option("", "--fuzzy-pixel-tests", action="store_true",
+                           default=False,
+                           help="Also use fuzzy matching to compare pixel test "
+                                "outputs.")
   option_parser.add_option("", "--wdiff", action="store_true",
                            default=False,
                            help="enable word-by-word diffing")
   option_parser.add_option("", "--results-directory",
                            default="layout-test-results",
                            help="Output results directory source dir,"
                                 " relative to Debug or Release")
   option_parser.add_option("", "--new-baseline", action="store_true",
                            default=False,
                            help="save all generated results as new baselines "
@@ skipping 44 matching lines @@
                            metavar="FILE")
   option_parser.add_option("", "--nocheck-sys-deps", action="store_true",
                            default=False,
                            help="Don't check the system dependencies (themes)")
   option_parser.add_option("", "--randomize-order", action="store_true",
                            default=False,
                            help=("Run tests in random order (useful for "
                                  "tracking down corruption)"))
   options, args = option_parser.parse_args()
   main(options, args)