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

[victorw at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 969aeba9e6a2a8d1bafe5db42e26f1af0453aee4
Author: victorw at chromium.org <victorw at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 22:11:08 2010 +0000

    2010-08-09  Victor Wang  <victorw at chromium.org>
    
            Reviewed by Ojan Vafai.
    
            Upload incremental test results json to server by default.
    
            https://bugs.webkit.org/show_bug.cgi?id=43743
    
            * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 72fc86b..d746f7d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-09  Victor Wang  <victorw at chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Upload incremental test results json to server by default.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43743
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-08-09  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 57383fb..490ac3c 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -890,7 +890,7 @@ class TestRunner:
             self._options.build_number, self._options.results_directory,
             BUILDER_BASE_URL, individual_test_timings,
             self._expectations, result_summary, self._test_files_list,
-            self._options.upload_incremental_results)
+            not self._options.upload_full_results)
 
         _log.debug("Finished writing JSON files.")
 
@@ -903,10 +903,10 @@ class TestRunner:
 
         attrs = [("builder", self._options.builder_name)]
         json_files = ["expectations.json"]
-        if self._options.upload_incremental_results:
-            json_files.append("incremental_results.json")
-        else:
+        if self._options.upload_full_results:
             json_files.append("results.json")
+        else:
+            json_files.append("incremental_results.json")
 
         files = [(file, os.path.join(self._options.results_directory, file))
             for file in json_files]
@@ -1661,10 +1661,10 @@ def parse_args(args=None):
         optparse.make_option("--test-results-server", default="",
             help=("If specified, upload results json files to this appengine "
                   "server.")),
-        optparse.make_option("--upload-incremental-results",
+        optparse.make_option("--upload-full-results",
             action="store_true",
             default=False,
-            help="If true, upload incremental json results to server."),
+            help="If true, upload full json results to server."),
     ]
 
     option_list = (configuration_options + print_options +

-- 
WebKit Debian packaging