luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-22 17:08:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize the "don't dump core from test subprocesses" code.

Browse Source 
g_test_init() was calling _g_messages_set_exit_on_fatal() from
subprocesses, to make fatal log messages call _exit() rather than
abort(), but the function name is sort of confusing, and we don't
really need it anyway, since g_log() can just call g_test_subprocess()
instead and decide for itself.

Likewise, update g_assertion_message() to do the check itself, rather
than calling into gmessages to do it, and fix
g_assertion_message_expr() to also check whether it should exit or
abort. (Previously it always called abort(), although this didn't
actually matter since that was dead code until
test_nonfatal_assertions was added.)

https://bugzilla.gnome.org/show_bug.cgi?id=711800
This commit is contained in:
Dan Winship
2013-11-23 12:06:05 -05:00
parent 97fac93670
commit 3d70db0750
4 changed files with 35 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
glib/gmessages.c
View File

@@ -56,8 +56,6 @@
#include <locale.h>
#include <errno.h>
#include "gmessages-private.h"
#include "glib-init.h"
#include "gbacktrace.h"
#include "gcharset.h"
@@ -285,7 +283,6 @@ static GLogDomain *g_log_domains = NULL;
static GPrintFunc glib_print_func = NULL;
static GPrintFunc glib_printerr_func = NULL;
static GPrivate g_log_depth;
static gboolean exit_on_fatal;
static GLogFunc default_log_func = g_log_default_handler;
static gpointer default_log_data = NULL;
static GTestLogFatalFunc fatal_log_func = NULL;
@@ -293,11 +290,20 @@ static gpointer fatal_log_data;
/* --- functions --- */
void
static void _g_log_abort (void) G_GNUC_NORETURN;
static void
_g_log_abort (void)
{
if (exit_on_fatal)
_exit (1);
if (g_test_subprocess ())
{
/* If this is a test case subprocess then it probably caused
* this error message on purpose, so just exit() rather than
* abort()ing, to avoid triggering any system crash-reporting
* daemon.
*/
_exit (1);
}
else
abort ();
}
@@ -1017,11 +1023,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 && !masquerade_fatal)
{
_g_log_abort ();
}
else if ((test_level & G_LOG_FLAG_FATAL) && !masquerade_fatal)
if ((test_level & G_LOG_FLAG_FATAL) && !masquerade_fatal)
{
#ifdef G_OS_WIN32
if (win32_keep_fatal_message)
@@ -1034,12 +1036,12 @@ g_logv (const gchar *log_domain,
if (IsDebuggerPresent () && !(test_level & G_LOG_FLAG_RECURSION))
G_BREAKPOINT ();
else
abort ();
_g_log_abort ();
#else
if (!(test_level & G_LOG_FLAG_RECURSION))
G_BREAKPOINT ();
else
abort ();
_g_log_abort ();
#endif /* !G_OS_WIN32 */
}
@@ -1634,9 +1636,3 @@ g_printf_string_upper_bound (const gchar *format,
gchar c;
return _g_vsnprintf (&c, 1, format, args) + 1;
}
void
_g_log_set_exit_on_fatal (void)
{
exit_on_fatal = TRUE;
}