[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:55:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e70187549d2bcf02a62a26ac5756bc6779fa71c8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 25 16:12:33 2010 +0000
2010-10-25 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70442.
http://trac.webkit.org/changeset/70442
https://bugs.webkit.org/show_bug.cgi?id=48248
http locking doesn't work on Windows (Requested by Ossy on
#webkit).
* Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70458 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 73bc97e..66c840c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-25 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r70442.
+ http://trac.webkit.org/changeset/70442
+ https://bugs.webkit.org/show_bug.cgi?id=48248
+
+ http locking doesn't work on Windows (Requested by Ossy on
+ #webkit).
+
+ * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
2010-10-25 Gabor Rapcsanyi <rgabor at inf.u-szeged.hu>
Reviewed by Ojan Vafai.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
index 01ab6ec..e0fd1b6 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
@@ -344,7 +344,7 @@ class TestShellThread(WatchableThread):
def cancel(self):
"""Clean up http lock and set a flag telling this thread to quit."""
- self._stop_servers_with_lock()
+ self._stop_http_lock()
WatchableThread.cancel(self)
def next_timeout(self):
@@ -392,15 +392,23 @@ class TestShellThread(WatchableThread):
self._current_group, self._filename_list = \
self._filename_list_queue.get_nowait()
except Queue.Empty:
- self._stop_servers_with_lock()
+ self._stop_http_lock()
self._kill_dump_render_tree()
tests_run_file.close()
return
- if self._current_group == "tests_to_http_lock":
- self._start_servers_with_lock()
- elif self._have_http_lock:
- self._stop_servers_with_lock()
+ if self._options.wait_for_httpd:
+ if self._current_group == "tests_to_http_lock":
+ self._http_lock_wait_begin = time.time()
+ self._port.acquire_http_lock()
+
+ self._port.start_http_server()
+ self._port.start_websocket_server()
+
+ self._have_http_lock = True
+ self._http_lock_wait_end = time.time()
+ elif self._have_http_lock:
+ self._stop_http_lock()
self._num_tests_in_current_group = len(self._filename_list)
self._current_group_start_time = time.time()
@@ -547,26 +555,11 @@ class TestShellThread(WatchableThread):
self._options)
self._driver.start()
- def _start_servers_with_lock(self):
- """Acquire http lock and start the servers."""
- self._http_lock_wait_begin = time.time()
- _log.debug('Acquire http lock ...')
- self._port.acquire_http_lock()
- _log.debug('Starting HTTP server ...')
- self._port.start_http_server()
- _log.debug('Starting WebSocket server ...')
- self._port.start_websocket_server()
- self._http_lock_wait_end = time.time()
- self._have_http_lock = True
-
- def _stop_servers_with_lock(self):
+ def _stop_http_lock(self):
"""Stop the servers and release http lock."""
if self._have_http_lock:
- _log.debug('Stopping HTTP server ...')
self._port.stop_http_server()
- _log.debug('Stopping WebSocket server ...')
self._port.stop_websocket_server()
- _log.debug('Release http lock ...')
self._port.release_http_lock()
self._have_http_lock = False
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index bbc1725..8963d1c 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -740,6 +740,17 @@ class TestRunner:
if not result_summary:
return None
+ # Do not start when http locking is enabled.
+ if not self._options.wait_for_httpd:
+ if self.needs_http():
+ self._printer.print_update('Starting HTTP server ...')
+ self._port.start_http_server()
+
+ if self.needs_websocket():
+ self._printer.print_update('Starting WebSocket server ...')
+ self._port.start_websocket_server()
+ # self._websocket_secure_server.Start()
+
return result_summary
def run(self, result_summary):
@@ -829,6 +840,11 @@ class TestRunner:
sys.stdout.flush()
_log.debug("flushing stderr")
sys.stderr.flush()
+ if not self._options.wait_for_httpd:
+ _log.debug("stopping http server")
+ self._port.stop_http_server()
+ _log.debug("stopping websocket server")
+ self._port.stop_websocket_server()
_log.debug("stopping helper")
self._port.stop_helper()
@@ -1586,6 +1602,9 @@ def parse_args(args=None):
optparse.make_option("--no-record-results", action="store_false",
default=True, dest="record_results",
help="Don't record the results."),
+ optparse.make_option("--wait-for-httpd", action="store_true",
+ default=False, dest="wait_for_httpd",
+ help="Wait for http locks."),
# old-run-webkit-tests also has HTTP toggle options:
# --[no-]http Run (or do not run) http tests
# (default: run)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list