Merge branch 'wip/smcv/use-g-test-skip-again' into 'master'

Revert "testsuite: Don't use g_test_skip"

See merge request GNOME/pango!246

5 files changed, 1 insertions, 15 deletions

diff --git a/meson.build b/meson.build
index 48e72686..aa537940 100644
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@ project('pango', 'c', 'cpp',
           # https://github.com/mesonbuild/meson/issues/2289
           'c_std=gnu99',
         ],
-        meson_version : '>= 0.54.0')
+        meson_version : '>= 0.55.3')
 
 add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_POSIX_THREAD_SAFE_FUNCTIONS', '-D_GNU_SOURCE', ], language: 'c')
 
diff --git a/tests/test-break.c b/tests/test-break.c
index c4359643..413fd088 100644
--- a/tests/test-break.c
+++ b/tests/test-break.c
@@ -72,12 +72,9 @@ 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
       g_free (contents);
       g_object_unref (layout);
       pango_attr_list_unref (attributes);
@@ -263,12 +260,9 @@ 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
       g_free (old_locale);
       return;
     }
diff --git a/tests/test-itemize.c b/tests/test-itemize.c
index b22f3c2f..dbe67e64 100644
--- a/tests/test-itemize.c
+++ b/tests/test-itemize.c
@@ -241,12 +241,9 @@ 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 a5b6d279..2ed2a732 100644
--- a/tests/test-layout.c
+++ b/tests/test-layout.c
@@ -311,12 +311,9 @@ 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 1f0276e6..18ab94cc 100644
--- a/tests/testboundaries_ucd.c
+++ b/tests/testboundaries_ucd.c
@@ -232,9 +232,7 @@ 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;
     }