Changeset 64709 in webkit

Timestamp:

Aug 4, 2010 10:19:16 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-08-04 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

Fix a problem that "archived test results" step doesn't work on Chromium buildbots
​https://bugs.webkit.org/show_bug.cgi?id=43333

• BuildSlaveSupport/test-result-archive:
  • Make layoutTestResultsDir local and pass it to archiveTestResults()
  • Adjust layoutTestResultsDir for Chromium

Location:

trunk/WebKitTools

Files:

• BuildSlaveSupport/test-result-archive (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKitTools/BuildSlaveSupport/test-result-archive

@@ -27 +27 @@
 
 sourceRootDirectory = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
-layoutTestResultsDir = os.path.abspath(os.path.join(sourceRootDirectory, "layout-test-results"))
 archiveFile = os.path.join(sourceRootDirectory, "layout-test-results.zip")
 
@@ -44 +43 @@
         parser.error("Action is required")
 
-    return archiveTestResults(options.configuration, options.platform)
+    layoutTestResultsDir = os.path.abspath(os.path.join(sourceRootDirectory, "layout-test-results"))
+    if options.platform == 'chromium':
+        # See results_directory() in webkitpy/layout_tests/port/chromium.py.
+        layoutTestResultsDir = os.path.abspath(os.path.join(sourceRootDirectory,
+            "WebKit", "chromium", "webkit", options.configuration.capitalize(),
+            "layout-test-results"))
 
-def archiveTestResults(configuration, platform):
+    return archiveTestResults(options.configuration, options.platform, layoutTestResultsDir)
+
+def archiveTestResults(configuration, platform, layoutTestResultsDir):
     assert platform in ('mac', 'win', 'gtk', 'qt', 'chromium')
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-04  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix a problem that "archived test results" step doesn't work on Chromium buildbots
+        https://bugs.webkit.org/show_bug.cgi?id=43333
+
+        * BuildSlaveSupport/test-result-archive:
+          - Make layoutTestResultsDir local and pass it to archiveTestResults()
+          - Adjust layoutTestResultsDir for Chromium
+
 2010-08-04  Kent Tamura  <tkent@chromium.org>