luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-10 12:55:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/hadess/socket-test-not-parallel' into 'master'

Browse Source 
tests: Run "timeout tests" sequentially

See merge request GNOME/glib!1239
This commit is contained in:
Philip Withnall 2019-11-26 10:51:20 +00:00
commit d8c5bcbb7d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/tests/cancellable.c
View File

@ -188,6 +188,12 @@ test_cancel_multiple_concurrent (void)
GCancellable *cancellable; GCancellable *cancellable;
guint i, iterations; guint i, iterations;
if (!g_test_thorough ())
{
g_test_skip ("Not running timing heavy test");
return;
}
cancellable = g_cancellable_new (); cancellable = g_cancellable_new ();
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);

6
gio/tests/socket.c
View File

@ -1130,6 +1130,12 @@ test_timed_wait (void)
gint64 start_time; gint64 start_time;
gint poll_duration; gint poll_duration;
if (!g_test_thorough ())
{
g_test_skip ("Not running timing heavy test");
return;
}
data = create_server (G_SOCKET_FAMILY_IPV4, echo_server_thread, FALSE, &error); data = create_server (G_SOCKET_FAMILY_IPV4, echo_server_thread, FALSE, &error);
if (error != NULL) if (error != NULL)
{ {