From f2a9a6142c7187b6dd700728ecfa5ea094ad6096 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 21 May 2013 00:07:18 +0100 Subject: [PATCH] gmessages: Fix up testing commit to handle fatal masquerading This makes glib/tests/testing pass again. --- glib/gmessages.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glib/gmessages.c b/glib/gmessages.c index daab0c4..1548f06 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -966,7 +966,7 @@ g_logv (const gchar *log_domain, && !fatal_log_func (log_domain, test_level, msg, fatal_log_data); } - if ((test_level & G_LOG_FLAG_FATAL) && exit_on_fatal) + if ((test_level & G_LOG_FLAG_FATAL) && exit_on_fatal && !masquerade_fatal) { _g_log_abort (); } -- 2.7.4