Makefile: build plugins before running TCG tests
Add back test-plugins and, after making sure it is always defined, do so unconditionally. Reported-by: Alex Bennée <alex.bennee@linaro.org> Fixes: 2c13c574418 ("configure, meson: move --enable-plugins to meson", 2023-09-07) Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Tested-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
4c545a05ab
commit
ce43e84260
@ -73,7 +73,7 @@ $(TCG_TESTS_TARGETS:%=distclean-tcg-tests-%): distclean-tcg-tests-%:
|
|||||||
build-tcg: $(BUILD_TCG_TARGET_RULES)
|
build-tcg: $(BUILD_TCG_TARGET_RULES)
|
||||||
|
|
||||||
.PHONY: check-tcg
|
.PHONY: check-tcg
|
||||||
.ninja-goals.check-tcg = all
|
.ninja-goals.check-tcg = all test-plugins
|
||||||
check-tcg: $(RUN_TCG_TARGET_RULES)
|
check-tcg: $(RUN_TCG_TARGET_RULES)
|
||||||
|
|
||||||
.PHONY: clean-tcg
|
.PHONY: clean-tcg
|
||||||
|
@ -80,10 +80,7 @@ if 'CONFIG_TCG' in config_all
|
|||||||
subdir('fp')
|
subdir('fp')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if get_option('plugins')
|
subdir('plugin')
|
||||||
subdir('plugin')
|
|
||||||
endif
|
|
||||||
|
|
||||||
subdir('unit')
|
subdir('unit')
|
||||||
subdir('qapi-schema')
|
subdir('qapi-schema')
|
||||||
subdir('qtest')
|
subdir('qtest')
|
||||||
|
@ -1,7 +1,13 @@
|
|||||||
t = []
|
t = []
|
||||||
foreach i : ['bb', 'empty', 'insn', 'mem', 'syscall']
|
if get_option('plugins')
|
||||||
|
foreach i : ['bb', 'empty', 'insn', 'mem', 'syscall']
|
||||||
t += shared_module(i, files(i + '.c'),
|
t += shared_module(i, files(i + '.c'),
|
||||||
include_directories: '../../include/qemu',
|
include_directories: '../../include/qemu',
|
||||||
dependencies: glib)
|
dependencies: glib)
|
||||||
endforeach
|
endforeach
|
||||||
alias_target('test-plugins', t)
|
endif
|
||||||
|
if t.length() > 0
|
||||||
|
alias_target('test-plugins', t)
|
||||||
|
else
|
||||||
|
run_target('test-plugins', command: find_program('true'))
|
||||||
|
endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user