walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[subset] enable instancing tests by default.

This commit is contained in:
Garret Rieger 2022-12-12 20:24:24 +00:00
parent 38a9628885
commit 9fbe52b88d
4 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/subset/data/Makefile.sources
View File

@ -47,6 +47,10 @@ TESTS = \
tests/math.tests \ tests/math.tests \
tests/math_coverage_offset.tests \ tests/math_coverage_offset.tests \
tests/post.tests \ tests/post.tests \
tests/full_instance.tests \
tests/instance_feature_variations.tests \
tests/instantiate_glyf.tests \
tests/pin_all_at_default.tests \
$(NULL) $(NULL)
# TODO: re-enable once colrv1 subsetting is stabilized. # TODO: re-enable once colrv1 subsetting is stabilized.
@ -59,8 +63,4 @@ XFAIL_TESTS = \
# Disabled because instancing is only available w/ experimental API on. # Disabled because instancing is only available w/ experimental API on.
DISABLED_TESTS = \ DISABLED_TESTS = \
tests/full_instance.tests \
tests/instance_feature_variations.tests \
tests/instantiate_glyf.tests \
tests/pin_all_at_default.tests \
$(NULL) $(NULL)

1
test/subset/generate-expected-outputs.py
View File

@ -35,7 +35,6 @@ def generate_expected_output(input_file, unicodes, profile_flags, instance_flags
"--no-overlap-flag", "--no-overlap-flag",
"--no-recalc-bounds", "--no-recalc-bounds",
"--no-recalc-timestamp", "--no-recalc-timestamp",
"--no-harfbuzz-repacker", # disable harfbuzz repacker so we aren't comparing to ourself.
"--output=%s" % instance_path, "--output=%s" % instance_path,
input_file] input_file]
args.extend(instance_flags) args.extend(instance_flags)

15
test/subset/meson.build
View File

@ -49,18 +49,12 @@ tests = [
'glyph_names', 'glyph_names',
'post', 'post',
'32bit_var_store', '32bit_var_store',
'pin_all_at_default',
'instantiate_glyf',
'full_instance',
'instance_feature_variations',
] ]
if get_option('experimental_api')
# instacing tests, only supported in experimental api
tests += [
'pin_all_at_default',
'instantiate_glyf',
'full_instance',
'instance_feature_variations',
]
endif
repack_tests = [ repack_tests = [
'basic', 'basic',
'prioritization', 'prioritization',
@ -70,7 +64,6 @@ repack_tests = [
'space_splitting', 'space_splitting',
] ]
run_test = find_program('run-tests.py') run_test = find_program('run-tests.py')
foreach t : tests foreach t : tests

4
util/hb-subset.cc
View File

@ -660,7 +660,6 @@ parse_drop_tables (const char *name,
return true; return true;
} }
#ifdef HB_EXPERIMENTAL_API
#ifndef HB_NO_VAR #ifndef HB_NO_VAR
static gboolean static gboolean
parse_instance (const char *name, parse_instance (const char *name,
@ -725,7 +724,6 @@ parse_instance (const char *name,
return true; return true;
} }
#endif #endif
#endif
template <GOptionArgFunc line_parser, bool allow_comments=true> template <GOptionArgFunc line_parser, bool allow_comments=true>
static gboolean static gboolean
@ -897,7 +895,6 @@ subset_main_t::add_options ()
{"drop-tables", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_drop_tables, "Drop the specified tables. Use --drop-tables-=... to subtract from the current set.", "list of string table tags or *"}, {"drop-tables", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_drop_tables, "Drop the specified tables. Use --drop-tables-=... to subtract from the current set.", "list of string table tags or *"},
{"drop-tables+", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, (gpointer) &parse_drop_tables, "Drop the specified tables.", "list of string table tags or *"}, {"drop-tables+", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, (gpointer) &parse_drop_tables, "Drop the specified tables.", "list of string table tags or *"},
{"drop-tables-", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, (gpointer) &parse_drop_tables, "Drop the specified tables.", "list of string table tags or *"}, {"drop-tables-", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, (gpointer) &parse_drop_tables, "Drop the specified tables.", "list of string table tags or *"},
#ifdef HB_EXPERIMENTAL_API
#ifndef HB_NO_VAR #ifndef HB_NO_VAR
{"instance", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_instance, {"instance", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) &parse_instance,
"(Partially|Fully) Instantiate a variable font. A location consists of the tag of a variation axis, followed by '=', followed by a\n" "(Partially|Fully) Instantiate a variable font. A location consists of the tag of a variation axis, followed by '=', followed by a\n"
@ -906,7 +903,6 @@ subset_main_t::add_options ()
"For example: --instance=\"wdth=100 wght=200\" or --instance=\"wdth=drop\"\n" "For example: --instance=\"wdth=100 wght=200\" or --instance=\"wdth=drop\"\n"
"Note: currently only fully instancing to the default location is supported\n", "Note: currently only fully instancing to the default location is supported\n",
"list of comma separated axis-locations"}, "list of comma separated axis-locations"},
#endif
#endif #endif
{nullptr} {nullptr}
}; };