diff options
| author | Garrett Regier <garrettregier@gmail.com> | 2015-11-20 03:13:12 -0800 |
|---|---|---|
| committer | Garrett Regier <garrettregier@gmail.com> | 2015-12-15 16:57:46 -0800 |
| commit | db4aec161947ef6611cea73c1908e3168d6f052d (patch) | |
| tree | 568c706b00db2651f189fdcc6a18444d0cf2dfed | |
| parent | e0bdd7f9ee0535c0c147f5c9a523bbc0139e1660 (diff) | |
| download | libpeas-db4aec161947ef6611cea73c1908e3168d6f052d.tar.gz | |
Cleanup handling G_DEBUG in testing-utils
| -rw-r--r-- | tests/testing-util/testing-util.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/testing-util/testing-util.c b/tests/testing-util/testing-util.c index addc9a0..8c6c28d 100644 --- a/tests/testing-util/testing-util.c +++ b/tests/testing-util/testing-util.c @@ -190,8 +190,8 @@ testing_util_init (void) { GError *error = NULL; const GDebugKey glib_debug_keys[] = { - { "fatal-warnings", G_LOG_LEVEL_WARNING }, - { "fatal-criticals", G_LOG_LEVEL_CRITICAL } + { "fatal-criticals", G_LOG_LEVEL_CRITICAL }, + { "fatal-warnings", G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING } }; if (initialized) @@ -209,10 +209,6 @@ testing_util_init (void) fatal_flags = g_parse_debug_string (g_getenv ("G_DEBUG"), glib_debug_keys, G_N_ELEMENTS (glib_debug_keys)); - /* The "fatal-warnings" key implies "fatal-criticals" */ - if ((fatal_flags & G_LOG_LEVEL_WARNING) != 0) - fatal_flags |= G_LOG_LEVEL_CRITICAL; - g_irepository_require_private (g_irepository_get_default (), BUILDDIR "/libpeas", "Peas", "1.0", 0, &error); |