projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c12538a
)
gmessages: Fix up testing commit to handle fatal masquerading
author
Colin Walters
<walters@verbum.org>
Mon, 20 May 2013 23:07:18 +0000
(
00:07
+0100)
committer
Colin Walters
<walters@verbum.org>
Mon, 20 May 2013 23:07:18 +0000
(
00:07
+0100)
This makes glib/tests/testing pass again.
glib/gmessages.c
patch
|
blob
|
history
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 ();
}