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

Revert "tests/option-context: fix under --verbose"

Browse Source 
This reverts commit 80253cd710.
This commit is contained in:
Matthias Clasen
2012-12-19 15:20:20 -05:00
parent f64d6640d4
commit 50850fe08c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glib/tests/option-context.c
View File

@@ -124,16 +124,19 @@ test_group_captions (void)
for (j = 0; j < G_N_ELEMENTS (test_name_base); ++j) for (j = 0; j < G_N_ELEMENTS (test_name_base); ++j)
{ {
GTestTrapFlags trap_flags = 0;
gboolean expect_main_description = FALSE; gboolean expect_main_description = FALSE;
gboolean expect_main_switch = FALSE; gboolean expect_main_switch = FALSE;
gboolean expect_test_description = FALSE; gboolean expect_test_description = FALSE;
gboolean expect_test_switch = FALSE; gboolean expect_test_switch = FALSE;
gboolean expect_test_group = 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 = g_strdup_printf ("/option/group/captions:%s-%d",
test_name_base[j], i); test_name_base[j], i);
g_test_trap_subprocess (test_name, 0, g_test_trap_subprocess (test_name, 0, trap_flags);
G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR);
g_free (test_name); g_free (test_name);
g_test_trap_assert_passed (); g_test_trap_assert_passed ();
g_test_trap_assert_stderr (""); g_test_trap_assert_stderr ("");