| Message ID | 20250521164250.135776-6-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Maintainer updates for May (testing, plugins, virtio-gpu) - pre-PR | expand |
On 2025/05/22 1:42, Alex Bennée wrote: > The user can run a subset of the tcg tests directly, e.g.: > > make run-tcg-tests-hexagon-linux-user > > but in this case we fail if there has not been a full build to ensure > all the test-plugins are there. Fix the dependency to ensure we always > will build them before running tests. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/Makefile.include | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 23fb722d42..7f7f62cbf6 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -46,7 +46,7 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \ > $(eval $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak: config-host.mak)) > > .PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%) > -$(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak > +$(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak test-plugins I don't think this is going to work. test-plugins will invoke run-ninja, which is defined as follows: run-ninja: config-host.mak ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),) +$(if $(MAKE.nq),@:,$(quiet-@)$(NINJA) $(NINJAFLAGS) \ $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat) $(ninja-cmd-goals) should contain test-plugins, but it doesn't if I understand it correctly. > $(call quiet-command, \ > $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS), \ > "BUILD","$* guest-tests")
diff --git a/tests/Makefile.include b/tests/Makefile.include index 23fb722d42..7f7f62cbf6 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -46,7 +46,7 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \ $(eval $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak: config-host.mak)) .PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%) -$(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak +$(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak test-plugins $(call quiet-command, \ $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS), \ "BUILD","$* guest-tests")
The user can run a subset of the tcg tests directly, e.g.: make run-tcg-tests-hexagon-linux-user but in this case we fail if there has not been a full build to ensure all the test-plugins are there. Fix the dependency to ensure we always will build them before running tests. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)