From 8d9969fe15f2afc0c13b5d20a3103df666d68934 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Sun, 25 Nov 2012 11:50:09 -0500
Subject: [PATCH] tests/protocol: redo a bit

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
---
 glib/tests/protocol.c | 49 ++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/glib/tests/protocol.c b/glib/tests/protocol.c
index a07b9f0ba..440c4bace 100644
--- a/glib/tests/protocol.c
+++ b/glib/tests/protocol.c
@@ -33,8 +33,7 @@
 static 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");
 }
 
 static void
@@ -43,43 +42,37 @@ info (void)
 #ifdef g_info
 #error "rewrite this to use g_info()"
 #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
 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
 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
 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
 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
 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");
 }
 
 static gboolean
@@ -121,10 +114,9 @@ test_message (void)
   gchar* argv[] = {
           "./protocol",
           NULL,
-          "--verbose",
-          "-p", "/glib/testing/protocol/debug",
-          "-p", "/glib/testing/protocol/message",
-          "-p", "/glib/testing/protocol/gtest-message",
+          "-p", "/glib/testing/protocol:debug",
+          "-p", "/glib/testing/protocol:message",
+          "-p", "/glib/testing/protocol:gtest-message",
           NULL
   };
   GTestLogBuffer* tlb;
@@ -229,9 +221,9 @@ static void
 test_error (void)
 {
   gchar* tests[] = {
-          "/glib/testing/protocol/warning",
-          "/glib/testing/protocol/critical",
-          "/glib/testing/protocol/error"
+          "/glib/testing/protocol:warning",
+          "/glib/testing/protocol:critical",
+          "/glib/testing/protocol:error"
   };
   gint i;
   int             messages = 0;
@@ -241,7 +233,6 @@ test_error (void)
       gchar* argv[] = {
               "./protocol",
               NULL,
-              "--verbose",
               "-p", tests[i],
               NULL
       };
@@ -339,13 +330,13 @@ main (int   argc,
   g_test_init (&argc, &argv, NULL);
 
   /* 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/info", info);
-  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/critical", critical);
-  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:debug", debug);
+  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:warning", warning);
+  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:gtest-message", gtest_message);
 
   /* these are the real tests */
   g_test_add_func ("/glib/testing/protocol/test-message", test_message);