From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 16 Nov 2021 23:45:34 +0000 (-0500)
Subject: Don't spam debug messages into TAP output
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~5^2~136^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c86789427d6c9dd55d6a8ed2799bd8450cedbf3d;p=gtk4.git

Don't spam debug messages into TAP output

g_log_writer_standard_streams just puts all the logs
out onto stderr and stdout if we don't stop it. Pango
recently grew a bunch of g_debug calls, and those were
now showing up, making all the reftests fail.
---

diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c
index 232108f46a..3872f554dc 100644
--- a/testsuite/reftests/gtk-reftest.c
+++ b/testsuite/reftests/gtk-reftest.c
@@ -497,7 +497,10 @@ log_writer (GLogLevelFlags   log_level,
     }
 #endif
 
-  return g_log_writer_standard_streams (log_level, fields, n_fields, user_data);
+ if (!g_log_writer_default_would_drop (log_level, NULL))
+    return g_log_writer_standard_streams (log_level, fields, n_fields, user_data);
+
+  return G_LOG_WRITER_HANDLED;
 }
 
 int