[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8a2c827587add34e95a20de4b63c4f6e9de234ed
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 00:58:25 2010 +0000

    2010-02-24  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by David Levin.
    
            Fix the function signature for check_sys_deps on the mac port, and
            fix the ordering of port_obj.check_sys_deps() and
            port_obj.start_helper() (helper needs to be started before we check
            the system configuration).
    
            http://bugs.webkit.org/show_bug.cgi?id=35367
    
            * Scripts/webkitpy/layout_tests/port/mac.py:
            * Scripts/webkitpy/layout_tests/port/test.py:
            * Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8c63f1e..611583d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-24  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by David Levin.
+
+        Fix the function signature for check_sys_deps on the mac port, and
+        fix the ordering of port_obj.check_sys_deps() and
+        port_obj.start_helper() (helper needs to be started before we check
+        the system configuration).
+
+        http://bugs.webkit.org/show_bug.cgi?id=35367
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        * Scripts/webkitpy/layout_tests/port/test.py:
+        * Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py:
+
 2010-02-24  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
index d355f62..9b70cb7 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
@@ -66,7 +66,7 @@ class MacPort(base.Port):
         dirs.append(self._webkit_baseline_path('mac'))
         return dirs
 
-    def check_sys_deps(self):
+    def check_sys_deps(self, needs_http):
         if executive.run_command([self.script_path("build-dumprendertree")], return_exit_code=True) != 0:
             return False
 
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py
index c3e97be..75e56af 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py
@@ -52,7 +52,7 @@ class TestPort(base.Port):
     def baseline_search_path(self):
         return [self.baseline_path()]
 
-    def check_sys_deps(self):
+    def check_sys_deps(self, needs_http):
         return True
 
     def diff_image(self, actual_filename, expected_filename,
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py
index b6d9b35..14aff9e 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py
@@ -579,7 +579,6 @@ class TestRunner:
         except KeyboardInterrupt:
             for thread in threads:
                 thread.cancel()
-            self._port.stop_helper()
             raise
         for thread in threads:
             # Check whether a TestShellThread died before normal completion.
@@ -614,10 +613,6 @@ class TestRunner:
             return 0
         start_time = time.time()
 
-        # Start up any helper needed
-        if not self._options.no_pixel_tests:
-            self._port.start_helper()
-
         if self.needs_http():
             self._port.start_http_server()
 
@@ -641,7 +636,6 @@ class TestRunner:
             self._run_tests(failures.keys(), retry_summary)
             failures = self._get_failures(retry_summary, include_crashes=True)
 
-        self._port.stop_helper()
         end_time = time.time()
 
         write = create_logging_writer(self._options, 'timing')
@@ -1460,11 +1454,6 @@ def main(options, args):
             "lint succeeded.")
         sys.exit(0)
 
-    # Check that the system dependencies (themes, fonts, ...) are correct.
-    if not options.nocheck_sys_deps:
-        if not port_obj.check_sys_deps(test_runner.needs_http()):
-            sys.exit(1)
-
     write = create_logging_writer(options, "config")
     write("Using port '%s'" % port_obj.name())
     write("Placing test results in %s" % options.results_directory)
@@ -1479,6 +1468,13 @@ def main(options, args):
     test_runner.parse_expectations(port_obj.test_platform_name(),
                                    options.target == 'Debug')
 
+    port_obj.start_helper()
+
+    # Check that the system dependencies (themes, fonts, ...) are correct.
+    if (not options.nocheck_sys_deps and
+         not port_obj.check_sys_deps(test_runner.needs_http())):
+        sys.exit(1)
+
     meter.update("Preparing tests ...")
     write = create_logging_writer(options, "expected")
     result_summary = test_runner.prepare_lists_and_print_output(write)
@@ -1494,6 +1490,8 @@ def main(options, args):
     meter.update("Starting ...")
     has_new_failures = test_runner.run(result_summary)
 
+    port_obj.stop_helper()
+
     logging.debug("Exit status: %d" % has_new_failures)
     sys.exit(has_new_failures)
 

-- 
WebKit Debian packaging