[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ffa73d4e488388e841e6abe49995819e29302d64
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 05:19:16 2010 +0000

    2010-08-04  Kent Tamura  <tkent at 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
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64709 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/BuildSlaveSupport/test-result-archive b/WebKitTools/BuildSlaveSupport/test-result-archive
index df02dbd..9a0acfe 100644
--- a/WebKitTools/BuildSlaveSupport/test-result-archive
+++ b/WebKitTools/BuildSlaveSupport/test-result-archive
@@ -26,7 +26,6 @@
 import optparse, os, shutil, subprocess, sys
 
 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")
 
 def main():
@@ -43,9 +42,16 @@ def main():
     if action not in ('archive'):
         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')
 
     try:
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2d38803..3316848 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,17 @@
 
         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 at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
         NRWT: websocket_server startup detection failure
         https://bugs.webkit.org/show_bug.cgi?id=43466
 

-- 
WebKit Debian packaging