Meson build: Always call subdir('tests')

kjellahl · kjellahl · commit 9ccf75f30db6 · 2022-11-07T13:50:41.000+01:00
Make the build_tests check more like the check in cairomm and libxml++. Then it's possible to combine build-tests=false with benchmark=true. See PR #84
diff --git a/meson.build b/meson.build
@@ -259,9 +259,7 @@ can_add_dist_script = not meson.is_subproject() or meson.version().version_compa
 subdir('MSVC_NMake')
 subdir('sigc++')
 subdir('examples')
-if build_tests
-  subdir('tests')
-endif
+subdir('tests')
 subdir('docs/reference')
 subdir('docs/manual')
 
diff --git a/tests/meson.build b/tests/meson.build
@@ -1,6 +1,6 @@
 # tests
 
-# input: sigcxx_own_dep, do_benchmark, can_benchmark, benchmark_dep
+# input: sigcxx_own_dep, build_tests, do_benchmark, can_benchmark, benchmark_dep
 
 benchmark_timeout = 100
 
@@ -59,10 +59,13 @@ foreach ex : test_programs
   exe_file = executable(ex_name, ex_sources,
     dependencies: sigcxx_own_dep,
     implicit_include_directories: false,
-    build_by_default: true
+    build_by_default: build_tests,
   )
 
-  test(ex_name, exe_file)
+  # If exe_file is a test program, it is built by default unconditionally.
+  if build_tests
+    test(ex_name, exe_file)
+  endif
 endforeach
 
 if can_benchmark
