Merge branch 'fix-gdbus-unix-address' into 'master'

Fix failing tests when G_MESSAGES_DEBUG is set (again)

See merge request GNOME/glib!247
This commit is contained in:
Philip Withnall 2018-08-16 21:27:47 +00:00
commit 1a30a6a1d0
2 changed files with 2 additions and 0 deletions

View File

@ -11,6 +11,7 @@ cache:
variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 2
G_MESSAGES_DEBUG: all
fedora-x86_64:
stage: build

View File

@ -128,6 +128,7 @@ test_x11_autolaunch (void)
g_unsetenv ("DISPLAY");
g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
g_unsetenv ("XDG_RUNTIME_DIR");
g_unsetenv ("G_MESSAGES_DEBUG");
set_up_mock_dbus_launch ();
print_address ();