[instancer] add/update tests for COLRv1 instancing

2025-04-05 05:25:05 +00:00 · 2024-05-02 10:05:18 -07:00 · 2024-05-02 10:05:18 -07:00 · f614a7d309
commit f614a7d309
parent 247039de5a
46 changed files with 7 additions and 3 deletions
--- a/test/subset/data/Makefile.am
+++ b/test/subset/data/Makefile.am
@ -51,7 +51,7 @@ EXTRA_DIST += \
 	expected/colr \
 	expected/colr_glyphs \
 	expected/colrv1 \
-	expected/colrv1_copy_varstore \
+	expected/colrv1_subset_varstore \
 	expected/colr_with_components \
 	expected/cbdt \
 	expected/variable \
--- a/test/subset/data/Makefile.sources
+++ b/test/subset/data/Makefile.sources
@ -11,7 +11,7 @@ TESTS = \
 	tests/colr.tests \
 	tests/colr_glyphs.tests \
 	tests/colrv1.tests \
-	tests/colrv1_copy_varstore.tests \
+	tests/colrv1_subset_varstore.tests \
 	tests/colr_with_components.tests \
 	tests/full-font.tests \
 	tests/glyf_bug_3131.tests \
--- a/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.default.E002,E003,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.default.E002,E003,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.default.E003,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.default.E003,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.default.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.default.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E000,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E000,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E002,E003,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E002,E003,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E003,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E003,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E000,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E000,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E002,E003,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E002,E003,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E003,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E003,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E000,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E000,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E002,E003,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E002,E003,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E003,E004.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E003,E004.ttf
--- a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41,42.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41,42.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41,42.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41,42.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41,42.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41,42.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41,42.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41,42.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41.ttf
--- a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41,42.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41,42.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41,42.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41,42.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41,42.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41,42.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.retain-all-codepoint.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41,42.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41,42.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41.ttf
--- a/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.retain-all-codepoint.ttf
+++ b/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.retain-all-codepoint.ttf
--- a/test/subset/data/expected/instantiate_colrv1/Foldit.default.retain-all-codepoint.wght=300-600.ttf
+++ b/test/subset/data/expected/instantiate_colrv1/Foldit.default.retain-all-codepoint.wght=300-600.ttf
--- a/test/subset/data/tests/colrv1_subset_varstore.tests
+++ b/test/subset/data/tests/colrv1_subset_varstore.tests
@ -11,3 +11,6 @@ SUBSETS:
 A
 AB
 *
+
+OPTIONS:
+no_fonttools
--- a/test/subset/data/tests/instantiate_colrv1.tests
+++ b/test/subset/data/tests/instantiate_colrv1.tests
@ -9,6 +9,7 @@ SUBSETS:

 INSTANCES:
 wght=900
+wght=300:600

 OPTIONS:
 no_fonttools
--- a/test/subset/meson.build
+++ b/test/subset/meson.build
@ -46,7 +46,7 @@ tests = [
  # TODO: re-enable once colrv1 subsetting is stabilized.
  # 'colrv1.notoemoji',
  'colrv1',
-  'colrv1_copy_varstore',
+  'colrv1_subset_varstore',
  'colr_with_components',
  'cbdt',
  'variable',