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

gio/tests/socket.c: clean up a test case a bit

Browse Source
This commit is contained in:
Dan Winship
2015-06-21 12:00:07 -04:00
parent 368c3f205f
commit b97d666b2f
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gio/tests/socket.c
View File

@@ -930,30 +930,30 @@ test_timed_wait (void)
} }
static int static int
duplicate_fd(int fd) duplicate_fd (int fd)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
HANDLE newfd; HANDLE newfd;
if (!DuplicateHandle (GetCurrentProcess (), if (!DuplicateHandle (GetCurrentProcess (),
(HANDLE)fd, (HANDLE)fd,
GetCurrentProcess (), GetCurrentProcess (),
&newfd, &newfd,
0, 0,
FALSE, FALSE,
DUPLICATE_SAME_ACCESS)) DUPLICATE_SAME_ACCESS))
{ {
return -1; return -1;
} }
return (int)newfd; return (int)newfd;
#else #else
return dup(fd); return dup (fd);
#endif #endif
} }
static void static void
test_fd_roundtrip (void) test_fd_reuse (void)
{ {
IPTestData *data; IPTestData *data;
GError *error = NULL; GError *error = NULL;
@@ -964,6 +964,8 @@ test_fd_roundtrip (void)
gssize len; gssize len;
gchar buf[128]; gchar buf[128];
g_test_bug ("741707");
data = create_server (G_SOCKET_FAMILY_IPV4, echo_server_thread, FALSE); data = create_server (G_SOCKET_FAMILY_IPV4, echo_server_thread, FALSE);
addr = g_socket_get_local_address (data->server, &error); addr = g_socket_get_local_address (data->server, &error);
g_assert_no_error (error); g_assert_no_error (error);
@@ -1421,6 +1423,7 @@ main (int argc,
GError *error = NULL; GError *error = NULL;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_bug_base ("https://bugzilla.gnome.org/");
sock = g_socket_new (G_SOCKET_FAMILY_IPV6, sock = g_socket_new (G_SOCKET_FAMILY_IPV6,
G_SOCKET_TYPE_STREAM, G_SOCKET_TYPE_STREAM,
@@ -1448,7 +1451,7 @@ main (int argc,
#endif #endif
g_test_add_func ("/socket/close_graceful", test_close_graceful); g_test_add_func ("/socket/close_graceful", test_close_graceful);
g_test_add_func ("/socket/timed_wait", test_timed_wait); g_test_add_func ("/socket/timed_wait", test_timed_wait);
g_test_add_func ("/socket/fd_roundtrip", test_fd_roundtrip); g_test_add_func ("/socket/fd_reuse", test_fd_reuse);
g_test_add_func ("/socket/address", test_sockaddr); g_test_add_func ("/socket/address", test_sockaddr);
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
g_test_add_func ("/socket/unix-from-fd", test_unix_from_fd); g_test_add_func ("/socket/unix-from-fd", test_unix_from_fd);