diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py')
| -rwxr-xr-x[-rw-r--r--] | Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py index 4886c30..7ead483 100644..100755 --- a/Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py +++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py @@ -45,7 +45,9 @@ TestRunner2 --> _InlineManager ---> _InlineWorker <-> Worker import logging import optparse +import printing import Queue +import sys import thread import threading import time @@ -315,9 +317,15 @@ if multiprocessing: _log.error("%s (pid %d) is wedged on test %s" % (self.name, self.pid, test_name)) 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() class _MultiProcessWorkerConnection(_WorkerConnection): |