From: Colin Walters <walters@verbum.org>
Date: Mon, 20 May 2013 23:07:18 +0000 (+0100)
Subject: gmessages: Fix up testing commit to handle fatal masquerading
X-Git-Tag: 2.37.1~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2a9a6142c7187b6dd700728ecfa5ea094ad6096;p=platform%2Fupstream%2Fglib.git

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