Title: [174656] trunk/Tools
- Revision
- 174656
- Author
- [email protected]
- Date
- 2014-10-13 11:50:16 -0700 (Mon, 13 Oct 2014)
Log Message
[XvfbDriver] Regular _expression_ used to match running X servers fails on Fedora 21.
https://bugs.webkit.org/show_bug.cgi?id=137659
Reviewed by Martin Robinson.
* Scripts/webkitpy/port/xvfbdriver.py:
(XvfbDriver._next_free_display): Update the regular _expression_ to also match Xorg.bin
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (174655 => 174656)
--- trunk/Tools/ChangeLog 2014-10-13 18:46:30 UTC (rev 174655)
+++ trunk/Tools/ChangeLog 2014-10-13 18:50:16 UTC (rev 174656)
@@ -1,3 +1,13 @@
+2014-10-13 Carlos Alberto Lopez Perez <[email protected]>
+
+ [XvfbDriver] Regular _expression_ used to match running X servers fails on Fedora 21.
+ https://bugs.webkit.org/show_bug.cgi?id=137659
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitpy/port/xvfbdriver.py:
+ (XvfbDriver._next_free_display): Update the regular _expression_ to also match Xorg.bin
+
2014-10-13 Alexey Proskuryakov <[email protected]>
Add more detailed wait time information to EWS metrics
Modified: trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py (174655 => 174656)
--- trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2014-10-13 18:46:30 UTC (rev 174655)
+++ trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2014-10-13 18:50:16 UTC (rev 174656)
@@ -59,7 +59,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('(X|Xvfb|Xorg)\s+.*\s:(?P<screen_number>\d+)', pid)
+ match = re.match('(X|Xvfb|Xorg|Xorg\.bin)\s+.*\s:(?P<screen_number>\d+)', pid)
if match:
reserved_screens.add(int(match.group('screen_number')))
for i in range(99):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
