From 0aa5dafefd85d01d486d0d26b75387df3a2927e3 Mon Sep 17 00:00:00 2001
From: Qunxin Liu <qxliu@google.com>
Date: Tue, 8 Aug 2023 08:33:11 -0700
Subject: [PATCH] fix bots.

-Also disable partial instancing tests for now, cause the command option
is wrapped by experimental_api
---
 test/subset/data/Makefile.am      | 1 -
 test/subset/data/Makefile.sources | 1 -
 test/subset/meson.build           | 2 +-
 util/hb-subset.cc                 | 4 ++++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am
index 4d46a6151..980bddb07 100644
--- a/test/subset/data/Makefile.am
+++ b/test/subset/data/Makefile.am
@@ -72,7 +72,6 @@ EXTRA_DIST += \
 	expected/collect_name_ids \
 	expected/instantiate_colrv1 \
 	expected/instantiate_cff2_update_metrics \
-	expected/glyf_partial_instancing \
 	fonts \
 	profiles \
 	$(NULL)
diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources
index ba2a1a2f4..919ec7391 100644
--- a/test/subset/data/Makefile.sources
+++ b/test/subset/data/Makefile.sources
@@ -63,7 +63,6 @@ TESTS = \
 	tests/collect_name_ids.tests \
 	tests/instantiate_colrv1.tests \
 	tests/instantiate_cff2_update_metrics.tests \
-	tests/glyf_partial_instancing.tests \
 	$(NULL)
 
 # TODO: re-enable once colrv1 subsetting is stabilized.
diff --git a/test/subset/meson.build b/test/subset/meson.build
index 9a993c19d..188d3dadd 100644
--- a/test/subset/meson.build
+++ b/test/subset/meson.build
@@ -65,7 +65,7 @@ tests = [
   'collect_name_ids',
   'instantiate_colrv1',
   'instantiate_cff2_update_metrics',
-  'glyf_partial_instancing',
+  #'glyf_partial_instancing',
 ]
 
 repack_tests = [
diff --git a/util/hb-subset.cc b/util/hb-subset.cc
index e416db238..bd3df8f57 100644
--- a/util/hb-subset.cc
+++ b/util/hb-subset.cc
@@ -707,6 +707,7 @@ parse_instance (const char *name,
       return false;
     }
 
+#ifdef HB_EXPERIMENTAL_API
     char *pp = s;
     pp = strpbrk (pp, ":");
     if (pp) // partial instancing
@@ -756,6 +757,7 @@ parse_instance (const char *name,
     }
     else
     {
+#endif
       if (strcmp (s, "drop") == 0)
       {
         if (!hb_subset_input_pin_axis_to_default (subset_main->input, subset_main->face, axis_tag))
@@ -784,7 +786,9 @@ parse_instance (const char *name,
           return false;
         }
       }
+#ifdef HB_EXPERIMENTAL_API
     }
+#endif
     s = strtok(nullptr, "=");
   }