diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2018-08-16 21:27:47 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-08-16 21:27:47 +0000 |
| commit | 1a30a6a1d03ac4a6a2f943fba5bb3799772458d9 (patch) | |
| tree | fe04b2ab9b4df6217b2421b7fbf91f66ad71bee5 | |
| parent | 9a3c7eca148eba902e12cd48ce995f42d376894c (diff) | |
| parent | 9f208e9f2b03d349810288580880162a3a765e8d (diff) | |
| download | glib-1a30a6a1d03ac4a6a2f943fba5bb3799772458d9.tar.gz | |
Merge branch 'fix-gdbus-unix-address' into 'master'
Fix failing tests when G_MESSAGES_DEBUG is set (again)
See merge request GNOME/glib!247
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | gio/tests/gdbus-unix-addresses.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 916f41e16..a3634df87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ cache: variables: MESON_TEST_TIMEOUT_MULTIPLIER: 2 + G_MESSAGES_DEBUG: all fedora-x86_64: stage: build diff --git a/gio/tests/gdbus-unix-addresses.c b/gio/tests/gdbus-unix-addresses.c index 746a7c2a7..531ce7a85 100644 --- a/gio/tests/gdbus-unix-addresses.c +++ b/gio/tests/gdbus-unix-addresses.c @@ -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 (); |