diff options
| author | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 23:49:22 +0000 |
|---|---|---|
| committer | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 23:49:22 +0000 |
| commit | 3f21aecc705b7cd278794d86d338b9c5086be619 (patch) | |
| tree | c1c5e7d58dc2dc60506ea453b9066f6446db0500 /webkit/tools | |
| parent | 21bf93a0311fda75e2c42d91953399405d0aa8c9 (diff) | |
| download | chromium_src-3f21aecc705b7cd278794d86d338b9c5086be619.zip chromium_src-3f21aecc705b7cd278794d86d338b9c5086be619.tar.gz chromium_src-3f21aecc705b7cd278794d86d338b9c5086be619.tar.bz2 | |
Modifies the layout test formatter to handle the change to exclude "LayoutTests" from paths in test_expectations.txt
R=ojan
BUG=none
TEST=run test output formatter, should find baselines successfully
Review URL: http://codereview.chromium.org/549060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/failure.py | 4 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/failure_finder.py | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/webkit/tools/layout_tests/layout_package/failure.py b/webkit/tools/layout_tests/layout_package/failure.py index f25cc31..fa0b5af 100644 --- a/webkit/tools/layout_tests/layout_package/failure.py +++ b/webkit/tools/layout_tests/layout_package/failure.py @@ -20,11 +20,11 @@ DIFF_TEXT_FILE_ENDING = "-diff.txt" CHROMIUM_SRC_HOME = "http://src.chromium.org/viewvc/chrome/trunk/src/webkit/" CHROMIUM_TRAC_HOME = CHROMIUM_SRC_HOME + "data/layout_tests/" -WEBKIT_TRAC_HOME = "http://trac.webkit.org/browser/trunk/" +WEBKIT_TRAC_HOME = "http://trac.webkit.org/browser/trunk/LayoutTests/" WEBKIT_SVN_HOSTNAME = "svn.webkit.org" THIRD_PARTY = "third_party" -WEBKIT_PLATFORM_URL_BASE = WEBKIT_TRAC_HOME + "LayoutTests/platform" +WEBKIT_PLATFORM_URL_BASE = WEBKIT_TRAC_HOME + "platform" WEBKIT_LAYOUT_TEST_BASE_URL = "http://svn.webkit.org/repository/webkit/trunk/" WEBKIT_IMAGE_BASELINE_BASE_URL_WIN = (WEBKIT_LAYOUT_TEST_BASE_URL + "LayoutTests/platform/win/") diff --git a/webkit/tools/layout_tests/layout_package/failure_finder.py b/webkit/tools/layout_tests/layout_package/failure_finder.py index 800aec8..afc6412 100644 --- a/webkit/tools/layout_tests/layout_package/failure_finder.py +++ b/webkit/tools/layout_tests/layout_package/failure_finder.py @@ -21,9 +21,9 @@ import zipfile from failure import Failure WEBKIT_TRAC_HOSTNAME = "trac.webkit.org" -WEBKIT_LAYOUT_TEST_BASE_URL = "http://svn.webkit.org/repository/webkit/trunk/" +WEBKIT_LAYOUT_TEST_BASE_URL = "http://svn.webkit.org/repository/webkit/trunk/LayoutTests/" WEBKIT_PLATFORM_BASELINE_URL = (WEBKIT_LAYOUT_TEST_BASE_URL + - "LayoutTests/platform/%s/") + "platform/%s/") BUILDBOT_BASE = "http://build.chromium.org/buildbot/" WEBKIT_BUILDER_BASE = BUILDBOT_BASE + "waterfall/builders/%s" @@ -100,7 +100,7 @@ LOCAL_BASELINE_REGEXES = [ ".*/webkit/data/layout_tests/platform/.*?/LayoutTests(/.*)", ".*/webkit/data/layout_tests/platform/.*?(/.*)", ".*/webkit/data/layout_tests(/.*)", - "LayoutTests(/.*)" + "(/.*)" ] UPSTREAM_IMAGE_FILE_ENDING = "-upstream.png" @@ -684,13 +684,12 @@ class FailureFinder(object): possible_chromium_files = [] possible_webkit_files = [] - reduced_filename = filename.replace("LayoutTests/", "") chromium_platform_url = LAYOUT_TEST_REPO_BASE_URL if not filename.startswith("chrome"): chromium_platform_url += "platform/%s/" chromium_platform_url += filename - webkit_platform_url = WEBKIT_PLATFORM_BASELINE_URL + reduced_filename + webkit_platform_url = WEBKIT_PLATFORM_BASELINE_URL + filename if IsMacPlatform(self.platform): self._AddBaselineURLs(possible_chromium_files, chromium_platform_url, |