Changeset 70683 in webkit

Timestamp:

Oct 27, 2010 11:58:18 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2010-10-27 Dimitri Glazkov <Dimitri Glazkov>

Unreviewed, rolling out r70674.
​http://trac.webkit.org/changeset/70674
​https://bugs.webkit.org/show_bug.cgi?id=48053

Broke Chromium Windows build.

• Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-27  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Unreviewed, rolling out r70674.
+        http://trac.webkit.org/changeset/70674
+        https://bugs.webkit.org/show_bug.cgi?id=48053
+
+        Broke Chromium Windows build.
+
+        * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-10-25  Tony Chang  <tony@chromium.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py

@@ -353 +353 @@
     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)
 
@@ -401 +401 @@
                         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)
@@ -552 +560 @@
             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

trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -741 +741 @@
             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
 
@@ -830 +841 @@
         _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()
@@ -1579 +1595 @@
             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