tests: Omit Gadget suite when Gadget is disabled

frida · May 3, 2024 · 698fbb1 · 698fbb1
1 parent 84cc761
commit 698fbb1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/tests/meson.build b/tests/meson.build
@@ -1,6 +1,5 @@
 test_sources = [
   'test-system.vala',
-  'test-gadget.vala',
   'test-host-session.vala',
   'runner.vala',
   'runner-glue.c',
@@ -10,6 +9,17 @@ test_sources = [
   'process-resource-usage.c',
 ]
 
+test_vala_args = []
+
+if agent_compat != ''
+  test_vala_args += '--define=CROSS_ARCH'
+endif
+
+if build_gadget
+  test_vala_args += '--define=HAVE_GADGET'
+  test_sources += 'test-gadget.vala'
+endif
+
 subdir('labrats')
 
 system_vala_args = []
@@ -34,11 +44,6 @@ else
   system_vala_args += ['--pkg=posix']
 endif
 
-test_vala_args = []
-if agent_compat != ''
-  test_vala_args += '--define=CROSS_ARCH'
-endif
-
 frida_tests = static_library('frida-tests', test_sources,
   vala_args: [
     '--pkg=gmodule-2.0',

diff --git a/tests/runner.vala b/tests/runner.vala
@@ -56,7 +56,7 @@ namespace Frida.Test {
 
 		Frida.AgentTest.add_tests ();
 #endif
-#if !WINDOWS
+#if HAVE_GADGET && !WINDOWS
 		Frida.GadgetTest.add_tests ();
 #endif
 		Frida.HostSessionTest.add_tests ();