Title: [116212] trunk/Tools
- Revision
- 116212
- Author
- [email protected]
- Date
- 2012-05-05 00:34:50 -0700 (Sat, 05 May 2012)
Log Message
[Gtk] GtkDriver is not required anymore after r116134
https://bugs.webkit.org/show_bug.cgi?id=85699
Reviewed by Csaba Osztrogonác.
Remove GtkDriver as it was replaced by the XvfbDriver and is
no longer needed.
* Scripts/webkitpy/layout_tests/port/gtk.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (116211 => 116212)
--- trunk/Tools/ChangeLog 2012-05-05 07:25:08 UTC (rev 116211)
+++ trunk/Tools/ChangeLog 2012-05-05 07:34:50 UTC (rev 116212)
@@ -1,5 +1,17 @@
2012-05-05 Zan Dobersek <[email protected]>
+ [Gtk] GtkDriver is not required anymore after r116134
+ https://bugs.webkit.org/show_bug.cgi?id=85699
+
+ Reviewed by Csaba Osztrogonác.
+
+ Remove GtkDriver as it was replaced by the XvfbDriver and is
+ no longer needed.
+
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+
+2012-05-05 Zan Dobersek <[email protected]>
+
Increase the display ID for the Xvfb process to use if pixel_tests argument
is true rather than if pixel_tests option is present. This fixes the
XvfbDriver in the same way r115825 fixed the now-redundant GtkDriver.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (116211 => 116212)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-05-05 07:25:08 UTC (rev 116211)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-05-05 07:34:50 UTC (rev 116212)
@@ -38,43 +38,6 @@
from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
from webkitpy.common.system.executive import Executive
-
-class GtkDriver(WebKitDriver):
- def _start(self, pixel_tests, per_test_args):
-
- # Collect the number of X servers running already and make
- # sure our Xvfb process doesn't clash with any of them.
- def x_filter(process_name):
- return process_name.find("Xorg") > -1
-
- running_displays = len(Executive().running_pids(x_filter))
-
- # Use even displays for pixel tests and odd ones otherwise. When pixel tests are disabled,
- # DriverProxy creates two drivers, one for normal and the other for ref tests. Both have
- # the same worker number, so this prevents them from using the same Xvfb instance.
- display_id = self._worker_number * 2 + running_displays
- if pixel_tests:
- display_id += 1
- run_xvfb = ["Xvfb", ":%d" % (display_id), "-screen", "0", "800x600x24", "-nolisten", "tcp"]
- with open(os.devnull, 'w') as devnull:
- self._xvfb_process = subprocess.Popen(run_xvfb, stderr=devnull)
- server_name = self._port.driver_name()
- environment = self._port.setup_environ_for_server(server_name)
- # We must do this here because the DISPLAY number depends on _worker_number
- environment['DISPLAY'] = ":%d" % (display_id)
- self._crashed_process_name = None
- self._crashed_pid = None
- self._server_process = ServerProcess(self._port, server_name, self.cmd_line(pixel_tests, per_test_args), environment)
-
- def stop(self):
- WebKitDriver.stop(self)
- if getattr(self, '_xvfb_process', None):
- # FIXME: This should use Executive.kill_process
- os.kill(self._xvfb_process.pid, signal.SIGTERM)
- self._xvfb_process.wait()
- self._xvfb_process = None
-
-
class GtkPort(WebKitPort, PulseAudioSanitizer):
port_name = "gtk"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
