Title: [218736] trunk/Tools
- Revision
- 218736
- Author
- [email protected]
- Date
- 2017-06-22 22:38:54 -0700 (Thu, 22 Jun 2017)
Log Message
REGRESSION(r218686): [GTK] Several unit tests are failing after r218686 in the bots
https://bugs.webkit.org/show_bug.cgi?id=173711
Reviewed by Carlos Alberto Lopez Perez.
I can't reproduce it locally, but it's complaining about a g_setenv() and I only added one in r218686 to recover
the XDG_RUNTIME_DIR, because it's required by Wayland to work. So, I guess that env var is not set in the bots.
* TestWebKitAPI/glib/WebKitGLib/WebKitTestBus.cpp:
(WebKitTestBus::run): Ensure value is not nullptr before calling g_setenv().
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (218735 => 218736)
--- trunk/Tools/ChangeLog 2017-06-23 04:34:14 UTC (rev 218735)
+++ trunk/Tools/ChangeLog 2017-06-23 05:38:54 UTC (rev 218736)
@@ -1,3 +1,16 @@
+2017-06-22 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(r218686): [GTK] Several unit tests are failing after r218686 in the bots
+ https://bugs.webkit.org/show_bug.cgi?id=173711
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ I can't reproduce it locally, but it's complaining about a g_setenv() and I only added one in r218686 to recover
+ the XDG_RUNTIME_DIR, because it's required by Wayland to work. So, I guess that env var is not set in the bots.
+
+ * TestWebKitAPI/glib/WebKitGLib/WebKitTestBus.cpp:
+ (WebKitTestBus::run): Ensure value is not nullptr before calling g_setenv().
+
2017-06-22 David Kilzer <[email protected]>
REGRESSION (r218419): 7 leaks in PluginLoadClientPolicies.mm
Modified: trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestBus.cpp (218735 => 218736)
--- trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestBus.cpp 2017-06-23 04:34:14 UTC (rev 218735)
+++ trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestBus.cpp 2017-06-23 05:38:54 UTC (rev 218736)
@@ -36,8 +36,10 @@
CString runtimeDir = g_getenv("XDG_RUNTIME_DIR");
g_test_dbus_up(m_bus.get());
m_address = g_test_dbus_get_bus_address(m_bus.get());
- g_setenv("DISPLAY", display.data(), FALSE);
- g_setenv("XDG_RUNTIME_DIR", runtimeDir.data(), FALSE);
+ if (!display.isNull())
+ g_setenv("DISPLAY", display.data(), FALSE);
+ if (!runtimeDir.isNull())
+ g_setenv("XDG_RUNTIME_DIR", runtimeDir.data(), FALSE);
return !m_address.isNull();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes