Changeset 70674 in webkit
- Timestamp:
- Oct 27, 2010 11:02:25 AM (13 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r70672 r70674 1 2010-10-27 Gabor Rapcsanyi <rgabor@inf.u-szeged.hu> 2 3 Reviewed by Ojan Vafai. 4 5 Make http locking default in NRWT. 6 https://bugs.webkit.org/show_bug.cgi?id=48053 7 8 * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py: 9 * Scripts/webkitpy/layout_tests/run_webkit_tests.py: 10 1 11 2010-10-27 Gabor Rapcsanyi <rgabor@inf.u-szeged.hu> 2 12 -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
r70648 r70674 353 353 def cancel(self): 354 354 """Clean up http lock and set a flag telling this thread to quit.""" 355 self._stop_ http_lock()355 self._stop_servers_with_lock() 356 356 WatchableThread.cancel(self) 357 357 … … 401 401 self._filename_list_queue.get_nowait() 402 402 except Queue.Empty: 403 self._stop_ http_lock()403 self._stop_servers_with_lock() 404 404 self._kill_dump_render_tree() 405 405 tests_run_file.close() 406 406 return 407 407 408 if self._options.wait_for_httpd: 409 if self._current_group == "tests_to_http_lock": 410 self._http_lock_wait_begin = time.time() 411 self._port.acquire_http_lock() 412 413 self._port.start_http_server() 414 self._port.start_websocket_server() 415 416 self._have_http_lock = True 417 self._http_lock_wait_end = time.time() 418 elif self._have_http_lock: 419 self._stop_http_lock() 408 if self._current_group == "tests_to_http_lock": 409 self._start_servers_with_lock() 410 elif self._have_http_lock: 411 self._stop_servers_with_lock() 420 412 421 413 self._num_tests_in_current_group = len(self._filename_list) … … 560 552 self._driver.start() 561 553 562 def _stop_http_lock(self): 554 def _start_servers_with_lock(self): 555 """Acquire http lock and start the servers.""" 556 self._http_lock_wait_begin = time.time() 557 _log.debug('Acquire http lock ...') 558 self._port.acquire_http_lock() 559 _log.debug('Starting HTTP server ...') 560 self._port.start_http_server() 561 _log.debug('Starting WebSocket server ...') 562 self._port.start_websocket_server() 563 self._http_lock_wait_end = time.time() 564 self._have_http_lock = True 565 566 def _stop_servers_with_lock(self): 563 567 """Stop the servers and release http lock.""" 564 568 if self._have_http_lock: 569 _log.debug('Stopping HTTP server ...') 565 570 self._port.stop_http_server() 571 _log.debug('Stopping WebSocket server ...') 566 572 self._port.stop_websocket_server() 573 _log.debug('Release http lock ...') 567 574 self._port.release_http_lock() 568 575 self._have_http_lock = False -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
r70590 r70674 741 741 return None 742 742 743 # Do not start when http locking is enabled.744 if not self._options.wait_for_httpd:745 if self.needs_http():746 self._printer.print_update('Starting HTTP server ...')747 self._port.start_http_server()748 749 if self.needs_websocket():750 self._printer.print_update('Starting WebSocket server ...')751 self._port.start_websocket_server()752 # self._websocket_secure_server.Start()753 754 743 return result_summary 755 744 … … 841 830 _log.debug("flushing stderr") 842 831 sys.stderr.flush() 843 if not self._options.wait_for_httpd:844 _log.debug("stopping http server")845 self._port.stop_http_server()846 _log.debug("stopping websocket server")847 self._port.stop_websocket_server()848 832 _log.debug("stopping helper") 849 833 self._port.stop_helper() … … 1595 1579 default=True, dest="record_results", 1596 1580 help="Don't record the results."), 1597 optparse.make_option("--wait-for-httpd", action="store_true",1598 default=False, dest="wait_for_httpd",1599 help="Wait for http locks."),1600 1581 # old-run-webkit-tests also has HTTP toggle options: 1601 1582 # --[no-]http Run (or do not run) http tests
Note: See TracChangeset
for help on using the changeset viewer.