luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests/protocol: redo a bit

Browse Source 
Rather than overloading --verbose, just skip the tests that aren't
supposed to be run in the parent process (so that if you do run the
toplevel test with --verbose, it doesn't immediately error out).

https://bugzilla.gnome.org/show_bug.cgi?id=679683
This commit is contained in:
Dan Winship 2012-11-25 11:50:09 -05:00
parent 960f5500e2
commit 467f9ea1bc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glib/tests/protocol.c
View File

@ -33,7 +33,7 @@
static void static void
debug (void) debug (void)
{ {
if (g_test_verbose ()) if (g_test_subprocess ())
g_debug ("this is a regular g_debug() from the test suite"); g_debug ("this is a regular g_debug() from the test suite");
} }
@ -43,42 +43,42 @@ info (void)
#ifdef g_info #ifdef g_info
#error "rewrite this to use g_info()" #error "rewrite this to use g_info()"
#endif #endif
if (g_test_verbose ()) if (g_test_subprocess ())
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "this is a regular g_log(..., G_LOG_LEVEL_INFO, ...) from the test suite"); g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "this is a regular g_log(..., G_LOG_LEVEL_INFO, ...) from the test suite");
} }
static void static void
message (void) message (void)
{ {
if (g_test_verbose ()) if (g_test_subprocess ())
g_message ("this is a regular g_message() from the test suite"); g_message ("this is a regular g_message() from the test suite");
} }
static void static void
warning (void) warning (void)
{ {
if (g_test_verbose ()) if (g_test_subprocess ())
g_warning ("this is a regular g_warning() from the test suite"); g_warning ("this is a regular g_warning() from the test suite");
} }
static void static void
critical (void) critical (void)
{ {
if (g_test_verbose ()) if (g_test_subprocess ())
g_critical ("this is a regular g_critical() from the test suite"); g_critical ("this is a regular g_critical() from the test suite");
} }
static void static void
error (void) error (void)
{ {
if (g_test_verbose ()) if (g_test_subprocess ())
g_error ("this is a regular g_error() from the test suite"); g_error ("this is a regular g_error() from the test suite");
} }
static void static void
gtest_message (void) gtest_message (void)
{ {
if (g_test_verbose ()) if (g_test_subprocess ())
g_test_message ("this is a regular g_test_message() from the test suite"); g_test_message ("this is a regular g_test_message() from the test suite");
} }
@ -121,7 +121,7 @@ test_message (void)
gchar* argv[] = { gchar* argv[] = {
"./protocol", "./protocol",
NULL, NULL,
"--verbose", "--GTestSubprocess",
"-p", "/glib/testing/protocol/debug", "-p", "/glib/testing/protocol/debug",
"-p", "/glib/testing/protocol/message", "-p", "/glib/testing/protocol/message",
"-p", "/glib/testing/protocol/gtest-message", "-p", "/glib/testing/protocol/gtest-message",
@ -241,7 +241,7 @@ test_error (void)
gchar* argv[] = { gchar* argv[] = {
"./protocol", "./protocol",
NULL, NULL,
"--verbose", "--GTestSubprocess",
"-p", tests[i], "-p", tests[i],
NULL NULL
}; };