Title: [130415] trunk/Tools
- Revision
- 130415
- Author
- [email protected]
- Date
- 2012-10-04 11:58:24 -0700 (Thu, 04 Oct 2012)
Log Message
Make the Xvfb driver recognize `X' as a valid X server binary.
https://bugs.webkit.org/show_bug.cgi?id=98434
Reviewed by Dirk Pranke.
The X server binary can also be called `X', so account for that
possibility in the _next_free_display regexp.
Additionally, make the regular _expression_ require at least one
space character after the `ps comm' part.
* Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
(XvfbDriver._next_free_display):
* Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py:
(XvfbDriverTest.test_next_free_display):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (130414 => 130415)
--- trunk/Tools/ChangeLog 2012-10-04 18:50:23 UTC (rev 130414)
+++ trunk/Tools/ChangeLog 2012-10-04 18:58:24 UTC (rev 130415)
@@ -1,5 +1,23 @@
2012-10-04 Raphael Kubo da Costa <[email protected]>
+ Make the Xvfb driver recognize `X' as a valid X server binary.
+ https://bugs.webkit.org/show_bug.cgi?id=98434
+
+ Reviewed by Dirk Pranke.
+
+ The X server binary can also be called `X', so account for that
+ possibility in the _next_free_display regexp.
+
+ Additionally, make the regular _expression_ require at least one
+ space character after the `ps comm' part.
+
+ * Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
+ (XvfbDriver._next_free_display):
+ * Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py:
+ (XvfbDriverTest.test_next_free_display):
+
+2012-10-04 Raphael Kubo da Costa <[email protected]>
+
webkitpy: Accept WEBKITOUTPUTDIR in Port._setup_environ_for_server.
https://bugs.webkit.org/show_bug.cgi?id=98436
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py (130414 => 130415)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py 2012-10-04 18:50:23 UTC (rev 130414)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py 2012-10-04 18:58:24 UTC (rev 130415)
@@ -48,7 +48,7 @@
running_pids = self._port.host.executive.run_command(['ps', '-eo', 'comm,command'])
reserved_screens = set()
for pid in running_pids.split('\n'):
- match = re.match('(Xvfb|Xorg).*\s:(?P<screen_number>\d+)', pid)
+ match = re.match('(X|Xvfb|Xorg)\s+.*\s:(?P<screen_number>\d+)', pid)
if match:
reserved_screens.add(int(match.group('screen_number')))
for i in range(99):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py (130414 => 130415)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py 2012-10-04 18:50:23 UTC (rev 130414)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py 2012-10-04 18:58:24 UTC (rev 130415)
@@ -85,6 +85,11 @@
driver = self.make_driver(executive=executive)
self.assertEqual(driver._next_free_display(), 2)
self.cleanup_driver(driver)
+ output = "X /usr/bin/X :0 vt7 -nolisten tcp -auth /var/run/xauth/A:0-8p7Ybb"
+ executive = MockExecutive2(output)
+ driver = self.make_driver(executive=executive)
+ self.assertEqual(driver._next_free_display(), 1)
+ self.cleanup_driver(driver)
output = "Xvfb Xvfb :0 -screen 0 800x600x24 -nolisten tcp"
executive = MockExecutive2(output)
driver = self.make_driver(executive=executive)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
