luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 08:16:24 +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 committed by Matthias Clasen
parent 80253cd710
commit 8d9969fe15
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
glib/tests/protocol.c
View File

@ -33,7 +33,6 @@
static void static void
debug (void) debug (void)
{ {
if (g_test_verbose ())
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 +42,36 @@ 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 ())
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 ())
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 ())
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 ())
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 ())
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 ())
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,10 +114,9 @@ test_message (void)
gchar* argv[] = { gchar* argv[] = {
"./protocol", "./protocol",
NULL, NULL,
"--verbose", "-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",
NULL NULL
}; };
GTestLogBuffer* tlb; GTestLogBuffer* tlb;
@ -229,9 +221,9 @@ static void
test_error (void) test_error (void)
{ {
gchar* tests[] = { gchar* tests[] = {
"/glib/testing/protocol/warning", "/glib/testing/protocol:warning",
"/glib/testing/protocol/critical", "/glib/testing/protocol:critical",
"/glib/testing/protocol/error" "/glib/testing/protocol:error"
}; };
gint i; gint i;
int messages = 0; int messages = 0;
@ -241,7 +233,6 @@ test_error (void)
gchar* argv[] = { gchar* argv[] = {
"./protocol", "./protocol",
NULL, NULL,
"--verbose",
"-p", tests[i], "-p", tests[i],
NULL NULL
}; };
@ -339,13 +330,13 @@ main (int argc,
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
/* we use ourself as the testcase, these are the ones we need internally */ /* we use ourself as the testcase, these are the ones we need internally */
g_test_add_func ("/glib/testing/protocol/debug", debug); g_test_add_func ("/glib/testing/protocol:debug", debug);
g_test_add_func ("/glib/testing/protocol/info", info); g_test_add_func ("/glib/testing/protocol:info", info);
g_test_add_func ("/glib/testing/protocol/message", message); g_test_add_func ("/glib/testing/protocol:message", message);
g_test_add_func ("/glib/testing/protocol/warning", warning); g_test_add_func ("/glib/testing/protocol:warning", warning);
g_test_add_func ("/glib/testing/protocol/critical", critical); g_test_add_func ("/glib/testing/protocol:critical", critical);
g_test_add_func ("/glib/testing/protocol/error", error); g_test_add_func ("/glib/testing/protocol:error", error);
g_test_add_func ("/glib/testing/protocol/gtest-message", gtest_message); g_test_add_func ("/glib/testing/protocol:gtest-message", gtest_message);
/* these are the real tests */ /* these are the real tests */
g_test_add_func ("/glib/testing/protocol/test-message", test_message); g_test_add_func ("/glib/testing/protocol/test-message", test_message);