Title: [209606] trunk/Tools
- Revision
- 209606
- Author
- g...@gnome.org
- Date
- 2016-12-09 07:30:34 -0800 (Fri, 09 Dec 2016)
Log Message
[GTK] Force GDK backend to x11 when running with XvfbDriver
https://bugs.webkit.org/show_bug.cgi?id=165612
Reviewed by Michael Catanzaro.
When the developer is running a Wayland session, GDK may get confused
and try to use its Wayland backend (which is higher priority) instead.
This ensures it will use the appropriate backend when running under
Xvfb.
* Scripts/webkitpy/port/gtk.py:
(GtkPort.setup_environ_for_server): when running with XvfbDriver,
force GDK_BACKEND to x11.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (209605 => 209606)
--- trunk/Tools/ChangeLog 2016-12-09 15:23:14 UTC (rev 209605)
+++ trunk/Tools/ChangeLog 2016-12-09 15:30:34 UTC (rev 209606)
@@ -1,3 +1,19 @@
+2016-12-09 Gustavo Noronha Silva <gustavo.noro...@collabora.co.uk>
+
+ [GTK] Force GDK backend to x11 when running with XvfbDriver
+ https://bugs.webkit.org/show_bug.cgi?id=165612
+
+ Reviewed by Michael Catanzaro.
+
+ When the developer is running a Wayland session, GDK may get confused
+ and try to use its Wayland backend (which is higher priority) instead.
+ This ensures it will use the appropriate backend when running under
+ Xvfb.
+
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.setup_environ_for_server): when running with XvfbDriver,
+ force GDK_BACKEND to x11.
+
2016-12-08 Keith Miller <keith_mil...@apple.com>
Add 64-bit signed LEB decode method
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (209605 => 209606)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2016-12-09 15:23:14 UTC (rev 209605)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2016-12-09 15:30:34 UTC (rev 209606)
@@ -119,6 +119,11 @@
environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
environment['OWR_USE_TEST_SOURCES'] = '1'
self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
+
+ if self._driver_class() is XvfbDriver:
+ # Make sure to use the correct GDK backend - we might have a Wayland session
+ environment['GDK_BACKEND'] = 'x11'
+
# Configure the software libgl renderer if jhbuild ready and we test inside a virtualized window system
if self._driver_class() in [XvfbDriver, WestonDriver] and self._should_use_jhbuild():
llvmpipe_libgl_path = self.host.executive.run_command(self._jhbuild_wrapper + ['printenv', 'LLVMPIPE_LIBGL_PATH'],
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
