gmessages: Fix up testing commit to handle fatal masquerading

This makes glib/tests/testing pass again.

diff --git a/glib/gmessages.c b/glib/gmessages.c
index daab0c4..1548f06 100644 (file)
--- 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 ();
             }