summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/layout_package
diff options
context:
space:
mode:
authorgwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 17:30:11 +0000
committergwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 17:30:11 +0000
commit3416cf7c6b0d8e640c4b2dfd91acce44fd15c83f (patch)
tree114d634c38222afa2f3b46c787844aa90a2d2bba /webkit/tools/layout_tests/layout_package
parentd277d432270803785ad05293674789c5f711b325 (diff)
downloadchromium_src-3416cf7c6b0d8e640c4b2dfd91acce44fd15c83f.zip
chromium_src-3416cf7c6b0d8e640c4b2dfd91acce44fd15c83f.tar.gz
chromium_src-3416cf7c6b0d8e640c4b2dfd91acce44fd15c83f.tar.bz2
Modifies the layout test formatter to not require an extra scrape of the builders if a local zip file is specified.
R=ojan BUG=none TEST=run test_output_formatter.bat/.sh with a local zip file, it should not scrape for zip output directory. Review URL: http://codereview.chromium.org/267079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/layout_package')
-rw-r--r--webkit/tools/layout_tests/layout_package/failure_finder.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/layout_package/failure_finder.py b/webkit/tools/layout_tests/layout_package/failure_finder.py
index 1e37928..5e8fb6c 100644
--- a/webkit/tools/layout_tests/layout_package/failure_finder.py
+++ b/webkit/tools/layout_tests/layout_package/failure_finder.py
@@ -382,15 +382,15 @@ class FailureFinder(object):
Finds and downloads/extracts all of the test results (pixel/text output)
for all of the given failures.
"""
- revision, build_name = self._GetRevisionAndBuildFromArchiveStep()
target_zip = "%s/layout-test-results-%s.zip" % (self.output_dir,
self.build)
- zip_url = GetZipFileURL(revision, build_name)
if self.zip_file:
filename = self.zip_file
self.delete_zip_file = False
else:
+ revision, build_name = self._GetRevisionAndBuildFromArchiveStep()
+ zip_url = GetZipFileURL(revision, build_name)
if self.verbose:
print "Downloading zip file from %s to %s" % (zip_url, target_zip)
filename = self._DownloadFile(zip_url, target_zip, "b")