diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-08-30 12:20:53 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-07 13:32:37 +0200 |
| commit | 2c13c574418e4b17974f7ef71d200ac064fb8d4b (patch) | |
| tree | c6a7220caebea402bff56da2897965ff4e0a1589 /tests | |
| parent | 2a5919ab642a3273698233ef46c83741eec327bf (diff) | |
| download | qemu-2c13c574418e4b17974f7ef71d200ac064fb8d4b.zip qemu-2c13c574418e4b17974f7ef71d200ac064fb8d4b.tar.gz qemu-2c13c574418e4b17974f7ef71d200ac064fb8d4b.tar.bz2 | |
configure, meson: move --enable-plugins to meson
While the option still needs to be parsed in the configure script
(it's needed by tests/tcg, and also to decide about recursing
into contrib/plugins), passing it to Meson can be done with -D
instead of using config-host.mak.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 2 | ||||
| -rw-r--r-- | tests/meson.build | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 985cda7..3898742 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -73,7 +73,7 @@ $(TCG_TESTS_TARGETS:%=distclean-tcg-tests-%): distclean-tcg-tests-%: build-tcg: $(BUILD_TCG_TARGET_RULES) .PHONY: check-tcg -.ninja-goals.check-tcg = all $(if $(CONFIG_PLUGIN),test-plugins) +.ninja-goals.check-tcg = all check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg diff --git a/tests/meson.build b/tests/meson.build index 083f299..c2528a8 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -80,10 +80,8 @@ if 'CONFIG_TCG' in config_all subdir('fp') endif -if get_option('tcg').allowed() - if 'CONFIG_PLUGIN' in config_host - subdir('plugin') - endif +if get_option('plugins') + subdir('plugin') endif subdir('unit') |