diff options
Diffstat (limited to 'glib/tests/logging.c')
| -rw-r--r-- | glib/tests/logging.c | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/glib/tests/logging.c b/glib/tests/logging.c index 9d69e6a04..aece49048 100644 --- a/glib/tests/logging.c +++ b/glib/tests/logging.c @@ -5,6 +5,9 @@ static void test_warnings (void) { + if (!g_test_undefined ()) + return; + if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) { g_warn_if_reached (); @@ -62,29 +65,32 @@ test_set_handler (void) static void test_default_handler (void) { - if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) - { - g_error ("message1"); - exit (0); - } - g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*ERROR*message1*"); - - if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) - { - g_critical ("message2"); - exit (0); - } - g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*CRITICAL*message2*"); - - if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) + if (g_test_undefined ()) { - g_warning ("message3"); - exit (0); + if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) + { + g_error ("message1"); + exit (0); + } + g_test_trap_assert_failed (); + g_test_trap_assert_stderr ("*ERROR*message1*"); + + if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) + { + g_critical ("message2"); + exit (0); + } + g_test_trap_assert_failed (); + g_test_trap_assert_stderr ("*CRITICAL*message2*"); + + if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) + { + g_warning ("message3"); + exit (0); + } + g_test_trap_assert_failed (); + g_test_trap_assert_stderr ("*WARNING*message3*"); } - g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*WARNING*message3*"); if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) { @@ -146,6 +152,9 @@ test_fatal_log_mask (void) { GLogLevelFlags flags; + if (!g_test_undefined ()) + return; + flags = g_log_set_fatal_mask ("bu", G_LOG_LEVEL_INFO); if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) g_log ("bu", G_LOG_LEVEL_INFO, "fatal"); @@ -233,6 +242,9 @@ test_handler (const gchar *log_domain, static void bug653052 (void) { + if (!g_test_undefined ()) + return; + g_test_bug ("653052"); g_test_log_set_fatal_handler (good_failure_handler, fail_str); |