From 50850fe08c92caafe99f8a1130479b6a63440e44 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 19 Dec 2012 15:20:20 -0500 Subject: [PATCH] Revert "tests/option-context: fix under --verbose" This reverts commit 80253cd71007975946a084697ccec9891102a3e7. --- glib/tests/option-context.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c index fb2f2b2..e58dbe5 100644 --- a/glib/tests/option-context.c +++ b/glib/tests/option-context.c @@ -124,16 +124,19 @@ test_group_captions (void) for (j = 0; j < G_N_ELEMENTS (test_name_base); ++j) { + GTestTrapFlags trap_flags = 0; gboolean expect_main_description = FALSE; gboolean expect_main_switch = FALSE; gboolean expect_test_description = FALSE; gboolean expect_test_switch = FALSE; gboolean expect_test_group = FALSE; + if (!g_test_verbose ()) + trap_flags |= G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR; + test_name = g_strdup_printf ("/option/group/captions:%s-%d", test_name_base[j], i); - g_test_trap_subprocess (test_name, 0, - G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR); + g_test_trap_subprocess (test_name, 0, trap_flags); g_free (test_name); g_test_trap_assert_passed (); g_test_trap_assert_stderr (""); -- 2.7.4