Title: [116211] trunk/Tools
- Revision
- 116211
- Author
- [email protected]
- Date
- 2012-05-05 00:25:08 -0700 (Sat, 05 May 2012)
Log Message
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.
Rubber-stamped by Csaba Osztrogonác.
* Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
(XvfbDriver._start):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (116210 => 116211)
--- trunk/Tools/ChangeLog 2012-05-05 06:52:38 UTC (rev 116210)
+++ trunk/Tools/ChangeLog 2012-05-05 07:25:08 UTC (rev 116211)
@@ -1,3 +1,14 @@
+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.
+
+ Rubber-stamped by Csaba Osztrogonác.
+
+ * Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
+ (XvfbDriver._start):
+
2012-05-04 Raphael Kubo da Costa <[email protected]>
webkitpy: Preserve XDG_DATA_DIRS in the environment passed to ServerProcess.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py (116210 => 116211)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py 2012-05-05 06:52:38 UTC (rev 116210)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py 2012-05-05 07:25:08 UTC (rev 116211)
@@ -52,7 +52,7 @@
# 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 self._port.get_option('pixel_tests'):
+ if pixel_tests:
display_id += 1
run_xvfb = ["Xvfb", ":%d" % (display_id), "-screen", "0", "800x600x24", "-nolisten", "tcp"]
with open(os.devnull, 'w') as devnull:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
