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

Merge branch 'w32-testsuite-fixes-general' into 'master'

Browse Source 
General fixes to W32 test suite

Closes #875

See merge request GNOME/glib!665
This commit is contained in:
Philip Withnall
2019-02-13 10:40:11 +00:00
parent 0f26836d73 1e74b5872e
commit c5c9b29b9d
7 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/autoptr.c
View File

@@ -8,7 +8,7 @@ test_autoptr (void)
g_autofree gchar *path = g_file_get_path (p);
g_autofree gchar *istr = g_inet_address_to_string (a);
g_assert_cmpstr (path, ==, "/blah");
g_assert_cmpstr (path, ==, G_DIR_SEPARATOR_S "blah");
g_assert_cmpstr (istr, ==, "127.0.0.1");
}

4
gio/tests/network-address.c
View File

@@ -271,6 +271,7 @@ find_ifname_and_index (void)
static void
test_scope_id (GSocketConnectable *addr)
{
#ifndef G_OS_WIN32
GSocketAddressEnumerator *addr_enum;
GSocketAddress *saddr;
GInetSocketAddress *isaddr;
@@ -300,6 +301,9 @@ test_scope_id (GSocketConnectable *addr)
g_assert (saddr == NULL);
g_object_unref (addr_enum);
#else
g_test_skip ("winsock2 getaddrinfo() can’t understand scope IDs");
#endif
}
static void