[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 c116e3b27d9a1ea7fa73204c703379f37c7c07dc
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 00:17:14 2010 +0000

    2010-11-01  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            remove debug code from run_webkit_tests.py
            https://bugs.webkit.org/show_bug.cgi?id=48800
    
            Remove temporary debug code and make --master-name required
            if --test-results-server is set now that all clients set
            --master-name.
    
            * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71083 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0aca0af..c8b51f5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-01  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        remove debug code from run_webkit_tests.py
+        https://bugs.webkit.org/show_bug.cgi?id=48800
+
+        Remove temporary debug code and make --master-name required
+        if --test-results-server is set now that all clients set
+        --master-name.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-11-01  Tony Chang  <tony at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 704180c..d169cd8 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -948,14 +948,15 @@ class TestRunner:
         if not self._options.test_results_server:
             return
 
+        if not self._options.master_name:
+            _log.error("--test-results-server was set, but --master-name was not. Not uploading JSON files.")
+            return
+
         _log.info("Uploading JSON files for builder: %s",
                    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))
+        attrs = [("builder", self._options.builder_name), ("testtype", "layout-tests"),
+            ("master", self._options.master_name)]
 
         json_files = ["expectations.json"]
         if self._options.upload_full_results:
@@ -966,13 +967,6 @@ class TestRunner:
         files = [(file, os.path.join(self._options.results_directory, file))
             for file in json_files]
 
-        # FIXME: Remove this. This is temporary debug logging.
-        if self._options.builder_name.startswith("Webkit Linux"):
-            for filename in files:
-                _log.debug(filename[1])
-                with codecs.open(filename[1], "r") as results_file:
-                    _log.debug("%s:\n%s" % (filename[0], results_file.read()))
-
         uploader = test_results_uploader.TestResultsUploader(
             self._options.test_results_server)
         try:

-- 
WebKit Debian packaging