aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarret Rieger <grieger@google.com>2023-10-10 21:41:42 +0000
committerBehdad Esfahbod <behdad@behdad.org>2023-10-10 17:59:05 -0600
commitbbd53fcfa49e9d4a8b3899ce2c109377886a3ba9 (patch)
treeebfee02463321f068062a5e62e955cba30c5b0dd
parent9648799e53edae7072505849fb551a6e621b8f6c (diff)
downloadharfbuzz_ng-bbd53fcfa49e9d4a8b3899ce2c109377886a3ba9.tar.gz
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.
-rw-r--r--test/subset/data/Makefile.am1
-rw-r--r--test/subset/data/Makefile.sources1
-rw-r--r--test/subset/data/expected/glyph_map/Roboto-Regular.glyph_map_roboto_retain_gids.41,43,61,66,69.ttfbin7936 -> 0 bytes
-rw-r--r--test/subset/data/profiles/glyph_map_roboto_retain_gids.txt4
-rw-r--r--test/subset/data/tests/glyph_map.tests1
-rw-r--r--test/subset/meson.build1
6 files changed, 3 insertions, 5 deletions
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 f63599984..000000000
--- a/test/subset/data/expected/glyph_map/Roboto-Regular.glyph_map_roboto_retain_gids.41,43,61,66,69.ttf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/profiles/glyph_map_roboto_retain_gids.txt b/test/subset/data/profiles/glyph_map_roboto_retain_gids.txt
deleted file mode 100644
index 77a513cbb..000000000
--- a/test/subset/data/profiles/glyph_map_roboto_retain_gids.txt
+++ /dev/null
@@ -1,4 +0,0 @@
---gid-map=37:37,39:39,69:69,74:74,77:77,444:444,446:446,561:561,563:563
---gids=444,446,561,563
---layout-features+=c2sc
---retain-gids
diff --git a/test/subset/data/tests/glyph_map.tests b/test/subset/data/tests/glyph_map.tests
index d222aceee..f2a3d17f4 100644
--- a/test/subset/data/tests/glyph_map.tests
+++ b/test/subset/data/tests/glyph_map.tests
@@ -3,7 +3,6 @@ Roboto-Regular.ttf
PROFILES:
glyph_map_roboto.txt
-glyph_map_roboto_retain_gids.txt
SUBSETS:
ACafi
diff --git a/test/subset/meson.build b/test/subset/meson.build
index 9c994236b..827528a51 100644
--- a/test/subset/meson.build
+++ b/test/subset/meson.build
@@ -50,6 +50,7 @@ tests = [
'cbdt',
'variable',
'glyph_names',
+ 'glyph_map',
'post',
'32bit_var_store',
'pin_all_at_default',