luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests/option-context: fix under --verbose

Browse Source 
We need to always pass G_TEST_TRAP_SILENCE_STDERR/STDOUT, or else
we can't check that they contained the right text later.

https://bugzilla.gnome.org/show_bug.cgi?id=679683
This commit is contained in:
Dan Winship 2012-11-25 11:42:59 -05:00 committed by Matthias Clasen
parent 723a8f5588
commit 80253cd710
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,19 +124,16 @@ 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, trap_flags);
g_test_trap_subprocess (test_name, 0,
G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR);
g_free (test_name);
g_test_trap_assert_passed ();
g_test_trap_assert_stderr ("");