From 9f208e9f2b03d349810288580880162a3a765e8d Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Thu, 16 Aug 2018 14:31:55 -0400
Subject: [PATCH] Fix failing tests when G_MESSAGES_DEBUG is set (again)

Similar issue was fixed with commit f929d148, but it's happening again.
Define G_MESSAGES_DEBUG=all when running CI to ensure we won't regress
anymore.
---
 .gitlab-ci.yml                   | 1 +
 gio/tests/gdbus-unix-addresses.c | 1 +
 2 files changed, 2 insertions(+)

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 ();