Changeset 83760 in webkit

Timestamp:

Apr 13, 2011 2:01:08 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-13 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Ojan Vafai.

new-run-webkit-tests: configure logging in child processes properly
​https://bugs.webkit.org/show_bug.cgi?id=58296

Logging propagated properly from manager to worker processes on
Unix but not on Windows; this fixes that.

• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py:
• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py (modified) (2 diffs, 1 prop)
• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-13  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        new-run-webkit-tests: configure logging in child processes properly
+        https://bugs.webkit.org/show_bug.cgi?id=58296
+
+        Logging propagated properly from manager to worker processes on
+        Unix but not on Windows; this fixes that.
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py:
+        * Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py:
+
 2011-04-13  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py

@@ -46 +46 @@
 import logging
 import optparse
+import printing
 import Queue
+import sys
 import thread
 import threading
@@ -316 +318 @@
 
         def run(self):
-            logging.basicConfig()
-            port_obj = port.get(self._platform_name, self._options)
+            options = self._options
+            port_obj = port.get(self._platform_name, options)
+            # FIXME: this won't work if the calling process is logging
+            # somewhere other than sys.stderr and sys.stdout, but I'm not sure
+            # if this will be an issue in practice.
+            printer = printing.Printer(port_obj, options, sys.stderr, sys.stdout,
+                int(options.child_processes), options.experimental_fully_parallel)
             self._client.run(port_obj)
+            printer.cleanup()
 
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py

@@ -43 +43 @@
 from webkitpy.layout_tests.layout_package import manager_worker_broker
 from webkitpy.layout_tests.layout_package import message_broker2
+from webkitpy.layout_tests.layout_package import printing
 
 # In order to reliably control when child workers are starting and stopping,
@@ -105 +106 @@
 
 def get_options(worker_model):
-    option_list = manager_worker_broker.runtime_options()
+    option_list = (manager_worker_broker.runtime_options() +
+                   printing.print_options() +
+                   [optparse.make_option("--experimental-fully-parallel", default=False),
+                    optparse.make_option("--child-processes", default='2')])
     parser = optparse.OptionParser(option_list=option_list)
     options, args = parser.parse_args(args=['--worker-model', worker_model])