From 0349359ce67f9b1554d9fb46c057bbb492997132 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 18 Mar 2025 14:59:26 -0600
Subject: [PATCH] [tests] Fix one test

---
 test/shape/data/in-house/tests/color-fonts.tests |  2 +-
 test/shape/run-tests.py                          | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/test/shape/data/in-house/tests/color-fonts.tests b/test/shape/data/in-house/tests/color-fonts.tests
index adaa9dec5..048bc2845 100644
--- a/test/shape/data/in-house/tests/color-fonts.tests
+++ b/test/shape/data/in-house/tests/color-fonts.tests
@@ -1,3 +1,3 @@
-@font-funcs=ot,ft # hb-fontations seems to infinite-loop
+@font-funcs=ot
 ../fonts/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf;--show-extents;U+1F42F;[gid1=0+2963<0,2179,2963,-2789>]
 ../fonts/fcbaa518d3cce441ed37ae3b1fed6a19e9b54efd.ttf;--show-extents;U+1F600;[gid4=0+2550<0,1898,2555,-2405>]
diff --git a/test/shape/run-tests.py b/test/shape/run-tests.py
index fa3203d31..db1ffe9eb 100755
--- a/test/shape/run-tests.py
+++ b/test/shape/run-tests.py
@@ -255,20 +255,25 @@ for filename in args:
                 passes += 1
                 continue
 
+            final_glyphs = glyphs
+            final_glyphs_expected = glyphs_expected
+
             if glyphs != glyphs_expected and glyphs.find("gid") != -1:
                 if not no_glyph_names_process:
                     no_glyph_names_process = open_shape_batch_process()
 
                 cmd2 = [fontfile] + ["--glyphs", "--no-glyph-names", glyphs]
-                glyphs = shape_cmd(cmd2, no_glyph_names_process).strip()
+                final_glyphs = shape_cmd(cmd2, no_glyph_names_process).strip()
 
                 cmd2 = [fontfile] + ["--glyphs", "--no-glyph-names", glyphs_expected]
-                glyphs_expected = shape_cmd(cmd2, no_glyph_names_process).strip()
+                final_glyphs_expected = shape_cmd(cmd2, no_glyph_names_process).strip()
 
-            if glyphs != glyphs_expected:
+            # If the removal of glyph_ids failed, fail the test.
+            # https://github.com/harfbuzz/harfbuzz/issues/5169
+            if not final_glyphs_expected or final_glyphs != final_glyphs_expected:
                 print(hb_shape + " " + " ".join(cmd), file=sys.stderr)
-                print("Actual:   " + glyphs, file=sys.stderr)
-                print("Expected: " + glyphs_expected, file=sys.stderr)
+                print("Actual:   " + final_glyphs, file=sys.stderr)
+                print("Expected: " + final_glyphs_expected, file=sys.stderr)
                 fails += 1
             else:
                 passes += 1