projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f64d664
)
Revert "tests/option-context: fix under --verbose"
author
Matthias Clasen
<mclasen@redhat.com>
Wed, 19 Dec 2012 20:20:20 +0000
(15:20 -0500)
committer
Matthias Clasen
<mclasen@redhat.com>
Wed, 19 Dec 2012 20:20:20 +0000
(15:20 -0500)
This reverts commit
80253cd71007975946a084697ccec9891102a3e7
.
glib/tests/option-context.c
patch
|
blob
|
history
diff --git
a/glib/tests/option-context.c
b/glib/tests/option-context.c
index
fb2f2b2
..
e58dbe5
100644
(file)
--- 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)
{
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;
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);
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 ("");
g_free (test_name);
g_test_trap_assert_passed ();
g_test_trap_assert_stderr ("");