luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-01 18:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio/tests: fix output of gdbus-proxy-threads and gdbus-threading

Browse Source 
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
This commit is contained in:
Dan Winship 2013-11-10 13:26:01 -05:00 committed by Matthias Clasen
parent c762a3a3f6
commit 8f5b40c046
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/tests/gdbus-proxy-threads.c
View File

@ -73,7 +73,8 @@ run_proxy_thread (gpointer data)
GError *error = NULL; GError *error = NULL;
GVariant *ret; GVariant *ret;
g_print ("."); if (!g_test_quiet ())
g_print (".");
proxy = g_dbus_proxy_new_sync (connection, proxy = g_dbus_proxy_new_sync (connection,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START | 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 /* TODO: should call session_bus_down() but that requires waiting
* for all the oustanding method calls to complete... * for all the oustanding method calls to complete...
*/ */
if (!g_test_quiet ())
g_print ("\n");
} }
int int

12
gio/tests/gdbus-threading.c
View File

@ -297,7 +297,8 @@ test_sleep_in_thread_func (gpointer _data)
(GAsyncReadyCallback) sleep_cb, (GAsyncReadyCallback) sleep_cb,
data); data);
g_main_loop_run (data->thread_loop); 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 ()); //g_debug ("done invoking async (%p)", g_thread_self ());
} }
else else
@ -314,7 +315,8 @@ test_sleep_in_thread_func (gpointer _data)
-1, -1,
NULL, NULL,
&error); &error);
g_print ("S"); if (!g_test_quiet ())
g_print ("S");
//g_debug ("done invoking sync (%p)", g_thread_self ()); //g_debug ("done invoking sync (%p)", g_thread_self ());
g_assert_no_error (error); g_assert_no_error (error);
g_assert (result != NULL); 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, >=, 3950);
g_assert_cmpint (elapsed_msec, <, 8000); 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 (proxy);
g_object_unref (connection); g_object_unref (connection);
if (!g_test_quiet ())
g_print ("\n");
} }
#define SLEEP_MIN_USEC 1 #define SLEEP_MIN_USEC 1