[glib] gio/tests: fix output of gdbus-proxy-threads and gdbus-threading
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gio/tests: fix output of gdbus-proxy-threads and gdbus-threading
- Date: Sat, 23 Nov 2013 06:03:00 +0000 (UTC)
commit 8f5b40c04672a150ed6df27d9f83aba8ec8ea29d
Author: Dan Winship <danw gnome org>
Date: Sun Nov 10 13:26:01 2013 -0500
gio/tests: fix output of gdbus-proxy-threads and gdbus-threading
Make gdbus-proxy-threads and gdbus-threading print a newline at the
end of their progress strings, to avoid messing up their TAP-format
output.
https://bugzilla.gnome.org/show_bug.cgi?id=711796
gio/tests/gdbus-proxy-threads.c | 5 ++++-
gio/tests/gdbus-threading.c | 12 +++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/gio/tests/gdbus-proxy-threads.c b/gio/tests/gdbus-proxy-threads.c
index c74c05c..74df408 100644
--- a/gio/tests/gdbus-proxy-threads.c
+++ b/gio/tests/gdbus-proxy-threads.c
@@ -73,7 +73,8 @@ run_proxy_thread (gpointer data)
GError *error = NULL;
GVariant *ret;
- g_print (".");
+ if (!g_test_quiet ())
+ g_print (".");
proxy = g_dbus_proxy_new_sync (connection,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
@@ -233,6 +234,8 @@ test_proxy (void)
/* TODO: should call session_bus_down() but that requires waiting
* for all the oustanding method calls to complete...
*/
+ if (!g_test_quiet ())
+ g_print ("\n");
}
int
diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
index 5851114..1c1f1df 100644
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.c
@@ -297,7 +297,8 @@ test_sleep_in_thread_func (gpointer _data)
(GAsyncReadyCallback) sleep_cb,
data);
g_main_loop_run (data->thread_loop);
- g_print ("A");
+ if (!g_test_quiet ())
+ g_print ("A");
//g_debug ("done invoking async (%p)", g_thread_self ());
}
else
@@ -314,7 +315,8 @@ test_sleep_in_thread_func (gpointer _data)
-1,
NULL,
&error);
- g_print ("S");
+ if (!g_test_quiet ())
+ g_print ("S");
//g_debug ("done invoking sync (%p)", g_thread_self ());
g_assert_no_error (error);
g_assert (result != NULL);
@@ -408,7 +410,8 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
g_assert_cmpint (elapsed_msec, >=, 3950);
g_assert_cmpint (elapsed_msec, <, 8000);
- g_print (" ");
+ if (!g_test_quiet ())
+ g_print (" ");
}
}
@@ -444,6 +447,9 @@ test_method_calls_in_thread (void)
g_object_unref (proxy);
g_object_unref (connection);
+
+ if (!g_test_quiet ())
+ g_print ("\n");
}
#define SLEEP_MIN_USEC 1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]