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

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ac2a0dbb326e77d3c5d2baef1b7a08ae4062fbd9
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 16:27:17 2010 +0000

    2010-10-27  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium] add a master-name flag to new-run-webkit-tests
            https://bugs.webkit.org/show_bug.cgi?id=48488
    
            The test results server now allows adding a master name to
            the uploaded files. This lets us distinguish bots that have
            the same name, but are on different masters.
    
            * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a9aa92e..1a33b99 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-27  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] add a master-name flag to new-run-webkit-tests
+        https://bugs.webkit.org/show_bug.cgi?id=48488
+
+        The test results server now allows adding a master name to
+        the uploaded files. This lets us distinguish bots that have
+        the same name, but are on different masters.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-10-28  Adam Roben  <aroben at apple.com>
 
         Don't append a newline to the test output if the frame has no document
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 14cf987..6fb6f9a 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -950,7 +950,12 @@ class TestRunner:
         _log.info("Uploading JSON files for builder: %s",
                    self._options.builder_name)
 
-        attrs = [("builder", self._options.builder_name)]
+        attrs = [("builder", self._options.builder_name), ("testtype", "layout-tests")]
+        # FIXME: master_name should be required if test_results_server is set.
+        # Throw an error if master_name isn't set.
+        if self._options.master_name:
+            attrs.append(("master", self._options.master_name))
+
         json_files = ["expectations.json"]
         if self._options.upload_full_results:
             json_files.append("results.json")
@@ -1680,6 +1685,7 @@ def parse_args(args=None):
 
     # FIXME: Move these into json_results_generator.py
     results_json_options = [
+        optparse.make_option("--master-name", help="The name of the buildbot master."),
         optparse.make_option("--builder-name", default="DUMMY_BUILDER_NAME",
             help=("The name of the builder shown on the waterfall running "
                   "this script e.g. WebKit.")),

-- 
WebKit Debian packaging