Rather, they are built when running `meson test`. This change is inert unless building with meson 1.7, as previous versions of meson build all `meson test` dependencies as part of `ninja all` as well.
See: https://mesonbuild.com/Release-notes-for-1-7-0.html#test-targets-no-longer-built-by-default An existing comment references this meson issue, with an included bug reference, but was written before meson 1.7 fixed the bug. Update the comment to change the advice from "if the bug gets fixed" to "when bumping the minimum meson version". Signed-off-by: Eli Schwartz <eschwa...@gentoo.org> --- qga/meson.build | 1 + rust/qemu-api/meson.build | 1 + tests/fp/meson.build | 2 ++ tests/functional/meson.build | 9 ++++----- tests/qtest/meson.build | 2 +- tests/unit/meson.build | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/qga/meson.build b/qga/meson.build index 89a4a8f713..44175ccedd 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -197,6 +197,7 @@ if host_os != 'windows' and not get_option('fuzzing') i = i + 1 endforeach qga_ssh_test = executable('qga-ssh-test', srcs, + build_by_default: false, dependencies: [qemuutil], c_args: ['-DQGA_BUILD_UNIT_TEST']) diff --git a/rust/qemu-api/meson.build b/rust/qemu-api/meson.build index a090297c45..fec38d6726 100644 --- a/rust/qemu-api/meson.build +++ b/rust/qemu-api/meson.build @@ -102,6 +102,7 @@ test('rust-qemu-api-integration', executable( 'rust-qemu-api-integration', files('tests/tests.rs', 'tests/vmstate_tests.rs'), + build_by_default: false, override_options: ['rust_std=2021', 'build.rust_std=2021'], rust_args: ['--test'], install: false, diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 9059a24752..9c50452bf1 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -57,6 +57,7 @@ fpcflags = [ fptest = executable( 'fp-test', ['fp-test.c', '../../fpu/softfloat.c'], + build_by_default: false, dependencies: [qemuutil, libsoftfloat, libtestfloat, libslowfloat], c_args: fpcflags, ) @@ -149,6 +150,7 @@ executable( fptestlog2 = executable( 'fp-test-log2', ['fp-test-log2.c', '../../fpu/softfloat.c'], + build_by_default: false, dependencies: [qemuutil, libsoftfloat], c_args: fpcflags, ) diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 311c6f1806..6d7dc91954 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -408,11 +408,10 @@ foreach speed : ['quick', 'thorough'] # Ideally we would add 'precache' to 'depends' here, such that # 'build_by_default: false' lets the pre-caching automatically # run immediately before the test runs. In practice this is - # broken in meson, with it running the pre-caching in the normal - # compile phase https://github.com/mesonbuild/meson/issues/2518 - # If the above bug ever gets fixed, when QEMU changes the min - # meson version, add the 'depends' and remove the custom - # 'run_target' logic below & in Makefile.include + # broken in older versions of meson, with it running the + # pre-caching in the normal compile phase. When QEMU changes + # the min meson version to >=1.7, add the 'depends' and remove + # the custom 'run_target' logic below & in Makefile.include test('func-' + testname, python, depends: [test_deps, test_emulator, emulator_modules, plugin_modules], diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 669d07c06b..0a5309005f 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -447,7 +447,7 @@ foreach dir : target_dirs deps += test_ss.all_dependencies() endif qtest_executables += { - test: executable(test, src, dependencies: deps) + test: executable(test, src, build_by_default: false, dependencies: deps) } endif diff --git a/tests/unit/meson.build b/tests/unit/meson.build index d5248ae51d..af9725a3f8 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -189,7 +189,7 @@ foreach test_name, extra: tests src += test_ss.all_sources() deps += test_ss.all_dependencies() endif - exe = executable(test_name, src, genh, dependencies: deps) + exe = executable(test_name, src, genh, build_by_default: false, dependencies: deps) test(test_name, exe, depends: test_deps.get(test_name, []), -- 2.49.1
