From 16f61a1c87f83ac750bdf529917519593a9ef58e Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Thu, 1 Dec 2022 23:57:30 +0000
Subject: [PATCH] [repacker] only build repacker fuzzer when experimental api
 is enabled.

---
 test/fuzzing/meson.build | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/test/fuzzing/meson.build b/test/fuzzing/meson.build
index 4a145c9c5..d38ca8f9f 100644
--- a/test/fuzzing/meson.build
+++ b/test/fuzzing/meson.build
@@ -1,11 +1,14 @@
 tests = [
   'hb-shape-fuzzer.cc',
   'hb-subset-fuzzer.cc',
-  'hb-repacker-fuzzer.cc',
   'hb-set-fuzzer.cc',
   'hb-draw-fuzzer.cc',
 ]
 
+if get_option('experimental_api')
+  tests += 'hb-repacker-fuzzer.cc'
+endif
+
 foreach file_name : tests
   test_name = file_name.split('.')[0]
 
@@ -20,8 +23,10 @@ foreach file_name : tests
     extra_cpp_args += '-DHB_IS_IN_FUZZER'
   endif
 
-  # TODO tie this to the experimental api setting.
-  extra_cpp_args += '-DHB_EXPERIMENTAL_API'
+  if get_option('experimental_api')
+    extra_cpp_args += '-DHB_EXPERIMENTAL_API'
+  endif
+
   exe = executable(test_name, sources,
     cpp_args: cpp_args + extra_cpp_args,
     include_directories: [incconfig, incsrc],
@@ -58,17 +63,19 @@ test('subset_fuzzer', find_program('run-subset-fuzzer-tests.py'),
   suite: ['fuzzing', 'slow'],
 )
 
-test('repacker_fuzzer', find_program('run-repacker-fuzzer-tests.py'),
-  args: [
-    hb_repacker_fuzzer_exe,
-  ],
-  # as the tests are ran concurrently let's raise acceptable time here
-  # ideally better to break and let meson handles them in parallel
-  timeout: 300,
-  workdir: meson.current_build_dir() / '..' / '..',
-  env: env,
-  suite: ['fuzzing', 'slow'],
-)
+if get_option('experimental_api')
+  test('repacker_fuzzer', find_program('run-repacker-fuzzer-tests.py'),
+    args: [
+      hb_repacker_fuzzer_exe,
+    ],
+    # as the tests are ran concurrently let's raise acceptable time here
+    # ideally better to break and let meson handles them in parallel
+    timeout: 300,
+    workdir: meson.current_build_dir() / '..' / '..',
+    env: env,
+    suite: ['fuzzing', 'slow'],
+  )
+endif
 
 test('draw_fuzzer', find_program('run-draw-fuzzer-tests.py'),
   args: [