Changeset 160481 in webkit

Timestamp:

Dec 12, 2013 1:17:23 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] WebProcess tests are failing with newer glib
​https://bugs.webkit.org/show_bug.cgi?id=125621

Reviewed by Martin Robinson.

Newer versions of glib unset the DISPLAY env variable in
g_test_dbus_up(). The WebProcess needs the DISPLAY variable to
work, and it's important to keep its value when running the tests
under Xvfb.

• UIProcess/API/gtk/tests/WebProcessTestRunner.cpp:

(WebProcessTestRunner::WebProcessTestRunner): Restore the DISPLAY
env variable after calling g_test_dbus_up().

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/WebProcessTestRunner.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-12  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebProcess tests are failing with newer glib
+        https://bugs.webkit.org/show_bug.cgi?id=125621
+
+        Reviewed by Martin Robinson.
+
+        Newer versions of glib unset the DISPLAY env variable in
+        g_test_dbus_up(). The WebProcess needs the DISPLAY variable to
+        work, and it's important to keep its value when running the tests
+        under Xvfb.
+
+        * UIProcess/API/gtk/tests/WebProcessTestRunner.cpp:
+        (WebProcessTestRunner::WebProcessTestRunner): Restore the DISPLAY
+        env variable after calling g_test_dbus_up().
+
 2013-12-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.cpp

@@ -27 +27 @@
     , m_bus(adoptGRef(g_test_dbus_new(G_TEST_DBUS_NONE)))
 {
+    // Save the DISPLAY env var to restore it after calling g_test_dbus_up() that unsets it.
+    // See https://bugs.webkit.org/show_bug.cgi?id=125621.
+    const char* display = g_getenv("DISPLAY");
     g_test_dbus_up(m_bus.get());
+    g_setenv("DISPLAY", display, FALSE);
     m_connection = adoptGRef(g_bus_get_sync(G_BUS_TYPE_SESSION, 0, 0));
 }