Changeset 70458 in webkit
- Timestamp:
- Oct 25, 2010 9:12:33 AM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r70442 r70458 1 2010-10-25 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r70442. 4 http://trac.webkit.org/changeset/70442 5 https://bugs.webkit.org/show_bug.cgi?id=48248 6 7 http locking doesn't work on Windows (Requested by Ossy on 8 #webkit). 9 10 * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py: 11 * Scripts/webkitpy/layout_tests/run_webkit_tests.py: 12 1 13 2010-10-25 Gabor Rapcsanyi <rgabor@inf.u-szeged.hu> 2 14 -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
r70442 r70458 345 345 def cancel(self): 346 346 """Clean up http lock and set a flag telling this thread to quit.""" 347 self._stop_ servers_with_lock()347 self._stop_http_lock() 348 348 WatchableThread.cancel(self) 349 349 … … 393 393 self._filename_list_queue.get_nowait() 394 394 except Queue.Empty: 395 self._stop_ servers_with_lock()395 self._stop_http_lock() 396 396 self._kill_dump_render_tree() 397 397 tests_run_file.close() 398 398 return 399 399 400 if self._current_group == "tests_to_http_lock": 401 self._start_servers_with_lock() 402 elif self._have_http_lock: 403 self._stop_servers_with_lock() 400 if self._options.wait_for_httpd: 401 if self._current_group == "tests_to_http_lock": 402 self._http_lock_wait_begin = time.time() 403 self._port.acquire_http_lock() 404 405 self._port.start_http_server() 406 self._port.start_websocket_server() 407 408 self._have_http_lock = True 409 self._http_lock_wait_end = time.time() 410 elif self._have_http_lock: 411 self._stop_http_lock() 404 412 405 413 self._num_tests_in_current_group = len(self._filename_list) … … 548 556 self._driver.start() 549 557 550 def _start_servers_with_lock(self): 551 """Acquire http lock and start the servers.""" 552 self._http_lock_wait_begin = time.time() 553 _log.debug('Acquire http lock ...') 554 self._port.acquire_http_lock() 555 _log.debug('Starting HTTP server ...') 556 self._port.start_http_server() 557 _log.debug('Starting WebSocket server ...') 558 self._port.start_websocket_server() 559 self._http_lock_wait_end = time.time() 560 self._have_http_lock = True 561 562 def _stop_servers_with_lock(self): 558 def _stop_http_lock(self): 563 559 """Stop the servers and release http lock.""" 564 560 if self._have_http_lock: 565 _log.debug('Stopping HTTP server ...')566 561 self._port.stop_http_server() 567 _log.debug('Stopping WebSocket server ...')568 562 self._port.stop_websocket_server() 569 _log.debug('Release http lock ...')570 563 self._port.release_http_lock() 571 564 self._have_http_lock = False -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
r70442 r70458 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 743 754 return result_summary 744 755 … … 830 841 _log.debug("flushing stderr") 831 842 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() 832 848 _log.debug("stopping helper") 833 849 self._port.stop_helper() … … 1587 1603 default=True, dest="record_results", 1588 1604 help="Don't record the results."), 1605 optparse.make_option("--wait-for-httpd", action="store_true", 1606 default=False, dest="wait_for_httpd", 1607 help="Wait for http locks."), 1589 1608 # old-run-webkit-tests also has HTTP toggle options: 1590 1609 # --[no-]http Run (or do not run) http tests
Note: See TracChangeset
for help on using the changeset viewer.