Mercurial > pidgin3 / changeset

--- a/libpurple/tests/test_image.c	Thu Jul 06 21:40:34 2017 -0500
+++ b/libpurple/tests/test_image.c	Sun Jul 09 19:07:30 2017 -0500
@@ -79,7 +79,10 @@
 	if(path != NULL) {
 		g_assert_cmpstr(purple_image_get_path(image), ==, path);
 	} else {
-		g_assert_cmpstr(purple_image_get_path(image), !=, "");
+		const gchar *apath = purple_image_get_path(image);
+
+		g_assert(apath);
+		g_assert_cmpstr(apath, !=, "");
 	}
 
 	g_assert_cmpstr(purple_image_get_extension(image), ==, ext);
@@ -160,6 +163,10 @@
 main(gint argc, gchar **argv) {
 	g_test_init(&argc, &argv, NULL);
 
+	#if GLIB_CHECK_VERSION(2, 38, 0)
+	g_test_set_nonfatal_assertions();
+	#endif /* GLIB_CHECK_VERSION(2, 38, 0) */
+
 	g_test_add_func("/image/new-from-bytes", test_image_new_from_bytes);
 	g_test_add_func("/image/new-from-data", test_image_new_from_data);
 	g_test_add_func("/image/new-from-file", test_image_new_from_file);

--- a/libpurple/tests/test_smiley.c	Thu Jul 06 21:40:34 2017 -0500
+++ b/libpurple/tests/test_smiley.c	Sun Jul 09 19:07:30 2017 -0500
@@ -149,6 +149,10 @@
 main(gint argc, gchar **argv) {
 	g_test_init(&argc, &argv, NULL);
 
+	#if GLIB_CHECK_VERSION(2, 38, 0)
+	g_test_set_nonfatal_assertions();
+	#endif /* GLIB_CHECK_VERSION(2, 38, 0) */
+
 	g_test_add_func("/smiley/new-from-data", test_smiley_new_from_data);
 	g_test_add_func("/smiley/new-from-file", test_smiley_new_from_file);
 

--- a/libpurple/tests/test_smiley_list.c	Thu Jul 06 21:40:34 2017 -0500
+++ b/libpurple/tests/test_smiley_list.c	Sun Jul 09 19:07:30 2017 -0500
@@ -87,6 +87,10 @@
 main(gint argc, gchar **argv) {
 	g_test_init(&argc, &argv, NULL);
 
+	#if GLIB_CHECK_VERSION(2, 38, 0)
+	g_test_set_nonfatal_assertions();
+	#endif /* GLIB_CHECK_VERSION(2, 38, 0) */
+
 	g_test_add_func("/smiley_list/new", test_smiley_list_new);
 	g_test_add_func("/smiley_list/add-remove", test_smiley_list_add_remove);