From bbd53fcfa49e9d4a8b3899ce2c109377886a3ba9 Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Tue, 10 Oct 2023 21:41:42 +0000 Subject: [PATCH] Remove glyph_map test that uses retain gids. We no longer allow the use of glyph map + retain gids (see: https://github.com/harfbuzz/harfbuzz/blob/main/src/hb-subset-plan.cc#L817). Also add the test to the meson file so it will be run by default. --- test/subset/data/Makefile.am | 1 + test/subset/data/Makefile.sources | 1 + ...yph_map_roboto_retain_gids.41,43,61,66,69.ttf | Bin 7936 -> 0 bytes .../profiles/glyph_map_roboto_retain_gids.txt | 4 ---- test/subset/data/tests/glyph_map.tests | 1 - test/subset/meson.build | 1 + 6 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 test/subset/data/expected/glyph_map/Roboto-Regular.glyph_map_roboto_retain_gids.41,43,61,66,69.ttf delete mode 100644 test/subset/data/profiles/glyph_map_roboto_retain_gids.txt diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am index 980bddb07..9a7d08ce0 100644 --- a/test/subset/data/Makefile.am +++ b/test/subset/data/Makefile.am @@ -56,6 +56,7 @@ EXTRA_DIST += \ expected/cbdt \ expected/variable \ expected/glyph_names \ + expected/glyph_map \ expected/math \ expected/math_coverage_offset \ expected/post \ diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources index 919ec7391..398f2b82a 100644 --- a/test/subset/data/Makefile.sources +++ b/test/subset/data/Makefile.sources @@ -47,6 +47,7 @@ TESTS = \ tests/sbix.tests \ tests/variable.tests \ tests/glyph_names.tests \ + tests/glyph_map.tests \ tests/math.tests \ tests/math_coverage_offset.tests \ tests/post.tests \ diff --git a/test/subset/data/expected/glyph_map/Roboto-Regular.glyph_map_roboto_retain_gids.41,43,61,66,69.ttf b/test/subset/data/expected/glyph_map/Roboto-Regular.glyph_map_roboto_retain_gids.41,43,61,66,69.ttf deleted file mode 100644 index f63599984abe5f93b554d551ea3b623641005827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7936 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 HAI