diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 20:29:29 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 20:29:29 +0000 |
| commit | 5febec0a8e7e92ac2b5cd45c7eebbead50b15f72 (patch) | |
| tree | ffe453045b5918df2162ba43a77a17d19cb32aaf | |
| parent | 43cf3ba4e6a3bc9a2ed2bc3a5f2e306fcd61f433 (diff) | |
| download | chromium_src-5febec0a8e7e92ac2b5cd45c7eebbead50b15f72.zip chromium_src-5febec0a8e7e92ac2b5cd45c7eebbead50b15f72.tar.gz chromium_src-5febec0a8e7e92ac2b5cd45c7eebbead50b15f72.tar.bz2 | |
Pull in the fuzzy matcher binary path from its directory under third_party.
Review URL: http://codereview.chromium.org/14480
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7084 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/platform_utils_linux.py | 4 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_types/fuzzy_image_diff.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py index 5c70111..f8cb79d 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py @@ -179,6 +179,10 @@ class PlatformUtility(object): # multiple debug/release targets). return PathFromBase('chrome', 'Hammer', self.TestShellBinary()) + def FuzzyMatchBinaryPath(self): + """Return the path to the fuzzy matcher binary.""" + return PathFromBase('third_party', 'fuzzymatch', 'fuzzymatch') + def TestListPlatformDir(self): """Return the platform-specific directory for where the test lists live""" return 'linux' diff --git a/webkit/tools/layout_tests/test_types/fuzzy_image_diff.py b/webkit/tools/layout_tests/test_types/fuzzy_image_diff.py index 4c5acaf..579a30a 100644 --- a/webkit/tools/layout_tests/test_types/fuzzy_image_diff.py +++ b/webkit/tools/layout_tests/test_types/fuzzy_image_diff.py @@ -39,7 +39,8 @@ class FuzzyImageDiff(test_type_base.TestTypeBase): failures.append(test_failures.FailureMissingImage(self)) # Run the fuzzymatcher - r = subprocess.call(['fuzzymatch', test_args.png_path, expected_png_file]) + r = subprocess.call([path_utils.GetPlatformUtil().FuzzyMatchBinaryPath(), + test_args.png_path, expected_png_file]) if r != 0: failures.append(test_failures.FailureFuzzyFailure(self)) |