diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources index 83f3e5ab0..845a77e73 100644 --- a/test/subset/data/Makefile.sources +++ b/test/subset/data/Makefile.sources @@ -47,6 +47,10 @@ TESTS = \ tests/math.tests \ tests/math_coverage_offset.tests \ tests/post.tests \ + tests/full_instance.tests \ + tests/instance_feature_variations.tests \ + tests/instantiate_glyf.tests \ + tests/pin_all_at_default.tests \ $(NULL) # 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_TESTS = \ - tests/full_instance.tests \ - tests/instance_feature_variations.tests \ - tests/instantiate_glyf.tests \ - tests/pin_all_at_default.tests \ $(NULL) diff --git a/test/subset/generate-expected-outputs.py b/test/subset/generate-expected-outputs.py index 2e22dcc3b..2b7a87f29 100755 --- a/test/subset/generate-expected-outputs.py +++ b/test/subset/generate-expected-outputs.py @@ -35,7 +35,6 @@ def generate_expected_output(input_file, unicodes, profile_flags, instance_flags "--no-overlap-flag", "--no-recalc-bounds", "--no-recalc-timestamp", - "--no-harfbuzz-repacker", # disable harfbuzz repacker so we aren't comparing to ourself. "--output=%s" % instance_path, input_file] args.extend(instance_flags) diff --git a/test/subset/meson.build b/test/subset/meson.build index f9b765a41..77a2029d7 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -49,18 +49,12 @@ tests = [ 'glyph_names', 'post', '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 = [ 'basic', 'prioritization', @@ -70,7 +64,6 @@ repack_tests = [ 'space_splitting', ] - run_test = find_program('run-tests.py') foreach t : tests diff --git a/util/hb-subset.cc b/util/hb-subset.cc index e02cff8d8..bd4dea2d3 100644 --- a/util/hb-subset.cc +++ b/util/hb-subset.cc @@ -660,7 +660,6 @@ parse_drop_tables (const char *name, return true; } -#ifdef HB_EXPERIMENTAL_API #ifndef HB_NO_VAR static gboolean parse_instance (const char *name, @@ -725,7 +724,6 @@ parse_instance (const char *name, return true; } #endif -#endif template 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, 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 {"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" @@ -906,7 +903,6 @@ subset_main_t::add_options () "For example: --instance=\"wdth=100 wght=200\" or --instance=\"wdth=drop\"\n" "Note: currently only fully instancing to the default location is supported\n", "list of comma separated axis-locations"}, -#endif #endif {nullptr} };