cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip /socket/ipv6_v4mapped, we don't support that.

Browse Source
This commit is contained in:
ajacoutot 2013-01-08 10:43:58 +00:00
parent 15843fa2f1
commit d3467eb646
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
devel/glib2/patches/patch-gio_tests_socket_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-gio_tests_socket_c,v 1.4 2012/10/25 15:41:52 ajacoutot Exp $
$OpenBSD: patch-gio_tests_socket_c,v 1.5 2013/01/08 10:43:58 ajacoutot Exp $
From 475edeb2edad68b4bef818deb7ee7db92598397f Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
@ -7,26 +7,22 @@ Subject: Allow slightly too big poll duration in /socket/timed_wait test
https://bugzilla.gnome.org/show_bug.cgi?id=686058
--- gio/tests/socket.c.orig Fri Aug 17 02:06:24 2012
+++ gio/tests/socket.c Fri Oct 19 15:15:39 2012
@@ -565,6 +565,8 @@ test_ipv6_v4mapped (void)
g_object_unref (addr);
--- gio/tests/socket.c.orig Mon Nov 26 17:52:48 2012
+++ gio/tests/socket.c Tue Jan 8 11:27:29 2013
@@ -549,6 +548,12 @@ test_ipv6_v4mapped (void)
g_socket_connect (client, v4addr, NULL, &error);
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CONNECTION_REFUSED))
+ goto out;
g_assert_no_error (error);
g_assert (g_socket_is_connected (client));
data = create_server (G_SOCKET_FAMILY_IPV6, v4mapped_server_thread, TRUE);
@@ -579,6 +581,7 @@ test_ipv6_v4mapped (void)
g_object_unref (client);
g_object_unref (v4addr);
+out:
g_slice_free (IPTestData, data);
}
#endif
@@ -617,7 +620,7 @@ test_timed_wait (void)
+ if (! g_socket_speaks_ipv4 (data->server))
+ {
+ g_test_message ("Test not run: not supported by the OS");
+ return;
+ }
+
client = g_socket_new (G_SOCKET_FAMILY_IPV4,
G_SOCKET_TYPE_STREAM,
G_SOCKET_PROTOCOL_DEFAULT,
@@ -617,7 +622,7 @@ test_timed_wait (void)
poll_duration = g_get_monotonic_time () - start_time;
g_assert_cmpint (poll_duration, >=, 98000);