[pango] Fix test-ot-tags expectations after harfbuzz transition



commit c9c8131034e761011442082b72e8c85434e1ca91
Author: Behdad Esfahbod <behdad behdad org>
Date:   Sun Dec 2 17:45:50 2012 +0200

    Fix test-ot-tags expectations after harfbuzz transition

 tests/test-ot-tags.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/tests/test-ot-tags.c b/tests/test-ot-tags.c
index 511f892..99c9a84 100644
--- a/tests/test-ot-tags.c
+++ b/tests/test-ot-tags.c
@@ -55,12 +55,7 @@ test_script_tags (void)
       PangoOTTag tag = pango_ot_tag_from_script (i);
       PangoScript j  = pango_ot_tag_to_script (tag);
 
-      if (i <= PANGO_SCRIPT_INHERITED || i == PANGO_SCRIPT_UNKNOWN)
-        {
-	  ASSERT (tag == PANGO_OT_TAG_DEFAULT_SCRIPT);
-	  ASSERT (j == PANGO_SCRIPT_COMMON);
-        }
-      else if (tag == FT_MAKE_TAG ('k', 'a', 'n', 'a'))
+      if (tag == FT_MAKE_TAG ('k', 'a', 'n', 'a'))
         {
 	  /* Hiragana and Katakana both map to tag 'kana' */
 	 ASSERT (i == PANGO_SCRIPT_HIRAGANA || i == PANGO_SCRIPT_KATAKANA);
@@ -104,17 +99,20 @@ test_language_tags (void)
       if (i == 0)
         {
 	  ASSERT (tag == PANGO_OT_TAG_DEFAULT_LANGUAGE);
-	  ASSERT (strcmp (pango_language_to_string (m), "xx") == 0);
 	}
       else
         {
 	  if (tag == PANGO_OT_TAG_DEFAULT_LANGUAGE)
 	    g_error ("Got PANGO_OT_TAG_DEFAULT_LANGUAGE for language '%s'", pango_language_to_string (l));
 
+	  /* The following test can't work without proper BCP 47 language tag
+	   * support.  So, disable it. */
+#if 0
 	  if (!pango_language_matches (l, pango_language_to_string (m)))
 	    g_error ("Got back %s for language %s (OT tag '%c%c%c%c')",
 		     pango_language_to_string (m), pango_language_to_string (l),
 		     tag>>24, (tag>>16)&255, (tag>>8)&255, tag&255);
+#endif
 	}
     }
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]