summaryrefslogtreecommitdiff
path: root/user/glib/broken-gio-tests.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/glib/broken-gio-tests.patch')
-rw-r--r--user/glib/broken-gio-tests.patch31
1 files changed, 10 insertions, 21 deletions
diff --git a/user/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch
index 0c1e3acb5..bb5b32418 100644
--- a/user/glib/broken-gio-tests.patch
+++ b/user/glib/broken-gio-tests.patch
@@ -1,7 +1,7 @@
Requires update-desktop-database
--- glib-2.52.1/gio/tests/appinfo.c.old 2016-10-22 00:17:49.000000000 -0500
+++ glib-2.52.1/gio/tests/appinfo.c 2017-08-20 23:23:32.581229536 -0500
-@@ -486,7 +486,7 @@
+@@ -637,7 +637,7 @@
g_test_add_func ("/appinfo/launch-context", test_launch_context);
g_test_add_func ("/appinfo/launch-context-signals", test_launch_context_signals);
g_test_add_func ("/appinfo/tryexec", test_tryexec);
@@ -15,7 +15,7 @@ Requires update-desktop-database
Requires working iconv
--- glib-2.52.1/gio/tests/converter-stream.c.old 2016-10-22 00:18:11.000000000 -0500
+++ glib-2.52.1/gio/tests/converter-stream.c 2017-08-20 23:21:31.711358101 -0500
-@@ -1203,7 +1203,7 @@
+@@ -1208,7 +1208,7 @@
};
CharsetTest charset_tests[] = {
{ "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 },
@@ -27,35 +27,24 @@ Requires working iconv
-Requires dconf
---- glib-2.52.1/gio/tests/gsettings.c.old 2017-08-20 23:26:31.284378974 -0500
-+++ glib-2.52.1/gio/tests/gsettings.c 2017-08-20 23:26:46.637699607 -0500
-@@ -2603,6 +2603,8 @@
- gchar *schema_text;
- gchar *enums;
- gint result;
-+ printf("1..0\n");
-+ return 0;
-
- setlocale (LC_ALL, "");
-
-
Requires update-desktop-database
--- glib-2.52.1/gio/tests/resources.c.old 2016-10-22 00:18:12.000000000 -0500
+++ glib-2.52.1/gio/tests/resources.c 2017-08-20 23:39:47.127025718 -0500
-@@ -426,6 +426,7 @@
+@@ -819,6 +819,7 @@
g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n");
g_bytes_unref (data);
+#if 0 // dlclose is noop on musl
g_type_module_unuse (G_TYPE_MODULE (module));
- found = g_resources_get_info ("/resourceplugin/test1.txt",
-@@ -434,6 +435,7 @@
- g_assert (!found);
+ found = g_resources_get_info ("/resourceplugin/test1.txt",
+--- a/gio/tests/resources.c
++++ b/gio/tests/resources.c
+@@ -828,6 +828,7 @@
+ g_assert_false (found);
g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
g_clear_error (&error);
+#endif
- }
- }
+ g_clear_object (&module);
+ }