From 440f9c2609b7f5f9d8f65619b029a5eb660de88b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 30 Jul 2020 11:52:25 -0400
Subject: testsuite: Don't use g_test_skip

meson 0.55 considers tests using it to be FAIL.

I disagree, but lets quietly skip until 0.55.1
is available.
---
 tests/test-break.c         | 14 ++++++++++++--
 tests/test-itemize.c       |  3 +++
 tests/test-layout.c        |  3 +++
 tests/testboundaries_ucd.c |  2 ++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/tests/test-break.c b/tests/test-break.c
index df9b78e2..6f4019e1 100644
--- a/tests/test-break.c
+++ b/tests/test-break.c
@@ -34,7 +34,7 @@
 
 static PangoContext *context;
 
-static void
+static gboolean
 test_file (const gchar *filename, GString *string)
 {
   gchar *contents;
@@ -73,9 +73,13 @@ test_file (const gchar *filename, GString *string)
 
   if (pango_layout_get_unknown_glyphs_count (layout) > 0)
     {
+#if 0
+      // See https://github.com/mesonbuild/meson/issues/7515
       char *msg = g_strdup_printf ("Missing glyphs - skipping %s. Maybe fonts are missing?", filename);
       g_test_skip (msg);
       g_free (msg);
+#endif
+      return FALSE;
     }
 
   pango_layout_get_log_attrs (layout, &attrs, &len);
@@ -222,6 +226,8 @@ test_file (const gchar *filename, GString *string)
   g_free (attrs);
   g_free (contents);
   pango_attr_list_unref (attributes);
+
+  return TRUE;
 }
 
 static gchar *
@@ -253,9 +259,12 @@ test_break (gconstpointer d)
   setlocale (LC_ALL, "en_US.utf8");
   if (strstr (setlocale (LC_ALL, NULL), "en_US") == NULL)
     {
+#if 0
+      // See https://github.com/mesonbuild/meson/issues/7515
       char *msg = g_strdup_printf ("Locale en_US.UTF-8 not available, skipping break %s", filename);
       g_test_skip (msg);
       g_free (msg);
+#endif
       return;
     }
 
@@ -263,7 +272,8 @@ test_break (gconstpointer d)
 
   dump = g_string_sized_new (0);
 
-  test_file (filename, dump);
+  if (!test_file (filename, dump))
+    return;
 
   diff = diff_with_file (expected_file, dump->str, dump->len, &error);
   g_assert_no_error (error);
diff --git a/tests/test-itemize.c b/tests/test-itemize.c
index 3c58e18f..cd145e40 100644
--- a/tests/test-itemize.c
+++ b/tests/test-itemize.c
@@ -241,9 +241,12 @@ test_itemize (gconstpointer d)
   setlocale (LC_ALL, "en_US.utf8");
   if (strstr (setlocale (LC_ALL, NULL), "en_US") == NULL)
     {
+#if 0
+      // See https://github.com/mesonbuild/meson/issues/7515
       char *msg = g_strdup_printf ("Locale en_US.UTF-8 not available, skipping itemization %s", filename);
       g_test_skip (msg);
       g_free (msg);
+#endif
       return;
     }
 
diff --git a/tests/test-layout.c b/tests/test-layout.c
index 52617ce6..58ab46eb 100644
--- a/tests/test-layout.c
+++ b/tests/test-layout.c
@@ -308,9 +308,12 @@ test_layout (gconstpointer d)
   setlocale (LC_ALL, "en_US.utf8");
   if (strstr (setlocale (LC_ALL, NULL), "en_US") == NULL)
     {
+#if 0
+      // See https://github.com/mesonbuild/meson/issues/7515
       char *msg = g_strdup_printf ("Locale en_US.UTF-8 not available, skipping layout %s", filename);
       g_test_skip (msg);
       g_free (msg);
+#endif
       return;
     }
 
diff --git a/tests/testboundaries_ucd.c b/tests/testboundaries_ucd.c
index 18ab94cc..1f0276e6 100644
--- a/tests/testboundaries_ucd.c
+++ b/tests/testboundaries_ucd.c
@@ -232,7 +232,9 @@ do_test (const gchar *filename,
   channel = g_io_channel_new_file (filename, "r", &error);
   if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
     {
+#if 0
       g_test_skip ("Test file not found");
+#endif
       return;
     }
 
-- 
cgit v1.2.1