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

Merge branch 'fix-convert-tests-windows' into 'master'

Browse Source 
glib/tests/convert.c: Skip tests that aren't meaningful for Windows

See merge request GNOME/glib!930
This commit is contained in:
Philip Withnall 2019-06-19 08:42:30 +00:00
commit 213b41e5a4
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glib/tests/convert.c
View File

@ -827,8 +827,11 @@ test_filename_to_utf8_embedded_nul_utf8 (void)
gsize bytes_read;
GError *error = NULL;
#ifndef G_OS_WIN32
/* G_FILENAME_ENCODING has no effect on Windows for g_get_filename_charsets() */
g_setenv ("G_FILENAME_ENCODING", "UTF-8", TRUE);
g_assert_true (g_get_filename_charsets (NULL));
#endif
res = g_filename_to_utf8 ("ab\0c", 4, &bytes_read, NULL, &error);
@ -848,8 +851,11 @@ test_filename_to_utf8_embedded_nul_iconv (void)
gsize bytes_read;
GError *error = NULL;
#ifndef G_OS_WIN32
/* G_FILENAME_ENCODING has no effect on Windows for g_get_filename_charsets() */
g_setenv ("G_FILENAME_ENCODING", "US-ASCII", TRUE);
g_assert_false (g_get_filename_charsets (NULL));
#endif
res = g_filename_to_utf8 ("ab\0c", 4, &bytes_read, NULL, &error);
@ -878,8 +884,11 @@ test_filename_from_utf8_embedded_nul_utf8 (void)
gsize bytes_read;
GError *error = NULL;
#ifndef G_OS_WIN32
/* G_FILENAME_ENCODING has no effect on Windows for g_get_filename_charsets() */
g_setenv ("G_FILENAME_ENCODING", "UTF-8", TRUE);
g_assert_true (g_get_filename_charsets (NULL));
#endif
res = g_filename_from_utf8 ("ab\0c", 4, &bytes_read, NULL, &error);
@ -899,8 +908,11 @@ test_filename_from_utf8_embedded_nul_iconv (void)
gsize bytes_read;
GError *error = NULL;
#ifndef G_OS_WIN32
/* G_FILENAME_ENCODING has no effect on Windows for g_get_filename_charsets() */
g_setenv ("G_FILENAME_ENCODING", "US-ASCII", TRUE);
g_assert_false (g_get_filename_charsets (NULL));
#endif
res = g_filename_from_utf8 ("ab\0c", 4, &bytes_read, NULL, &error);