[glib] gmessages: Fix up testing commit to handle fatal masquerading



commit f2a9a6142c7187b6dd700728ecfa5ea094ad6096
Author: Colin Walters <walters verbum org>
Date:   Tue May 21 00:07:18 2013 +0100

    gmessages: Fix up testing commit to handle fatal masquerading
    
    This makes glib/tests/testing pass again.

 glib/gmessages.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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 ();
             }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]