summaryrefslogtreecommitdiff
path: root/tests/test-font.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-08-30 17:05:44 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-08-31 07:50:18 -0400
commit01b028153ecd8e8398d578765de20421f8a0801a (patch)
tree56a9a1db51f66913be9629a0d59cc420476cd244 /tests/test-font.c
parent4f13d4f4b5bc15d84b55464c69d2b62b4d749a65 (diff)
downloadpango-01b028153ecd8e8398d578765de20421f8a0801a.tar.gz
tests: Test font roundtrips on MacOscoretext-font-describe
We were skipping the test that would have found the brokenness in the previous fix. Lets see if we can get the test working on MacOs.
Diffstat (limited to 'tests/test-font.c')
-rw-r--r--tests/test-font.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/tests/test-font.c b/tests/test-font.c
index 1d3290c7..c3a1c29f 100644
--- a/tests/test-font.c
+++ b/tests/test-font.c
@@ -258,20 +258,19 @@ test_roundtrip_plain (void)
PangoFont *font;
#ifdef HAVE_CARBON
- /* We probably don't have the right fonts */
- g_test_skip ("Skipping font-dependent tests on OS X");
- return;
+ desc = pango_font_description_from_string ("Helvetica 11");
+#else
+ desc = pango_font_description_from_string ("Cantarell 11");
#endif
fontmap = pango_cairo_font_map_get_default ();
context = pango_font_map_create_context (fontmap);
- desc = pango_font_description_from_string ("Cantarell 11");
font = pango_context_load_font (context, desc);
desc2 = pango_font_describe (font);
- g_assert (pango_font_description_equal (desc2, desc));
+ g_assert_true (pango_font_description_equal (desc2, desc));
pango_font_description_free (desc2);
g_object_unref (font);
@@ -287,12 +286,6 @@ test_roundtrip_emoji (void)
PangoFontDescription *desc, *desc2;
PangoFont *font;
-#ifdef HAVE_CARBON
- /* We probably don't have the right fonts */
- g_test_skip ("Skipping font-dependent tests on OS X");
- return;
-#endif
-
fontmap = pango_cairo_font_map_get_default ();
context = pango_font_map_create_context (fontmap);
@@ -308,7 +301,7 @@ test_roundtrip_emoji (void)
*/
pango_font_description_unset_fields (desc, PANGO_FONT_MASK_FAMILY);
pango_font_description_unset_fields (desc2, PANGO_FONT_MASK_FAMILY);
- g_assert (pango_font_description_equal (desc2, desc));
+ g_assert_true (pango_font_description_equal (desc2, desc));
pango_font_description_free (desc2);
g_object_unref (font);