| Message ID | 20201003085054.332992-1-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests: tcg: do not use implicit rules | expand |
On 10/3/20 10:50 AM, Paolo Bonzini wrote: > Use pattern rules to clarify which targets are going to match the > rule and to provide clearer error messages. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/Makefile.include | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 40d909badc..5aca98e60c 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -50,21 +50,21 @@ RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) > $(foreach PROBE_TARGET,$(TARGET_DIRS), \ > $(eval -include $(SRC_PATH)/tests/tcg/Makefile.prereqs)) > > -build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-plugins) > +$(BUILD_TCG_TARGET_RULES): build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-plugins) > $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ > -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ > SRC_PATH=$(SRC_PATH) \ > V="$(V)" TARGET="$*" guest-tests, \ > "BUILD", "TCG tests for $*") > > -run-tcg-tests-%: build-tcg-tests-% all > +$(RUN_TCG_TARGET_RULES): run-tcg-tests-%: build-tcg-tests-% all > $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ > -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ > SRC_PATH=$(SRC_PATH) SPEED="$(SPEED)" \ > V="$(V)" TARGET="$*" run-guest-tests, \ > "RUN", "TCG tests for $*") > > -clean-tcg-tests-%: > +$(CLEAN_TCG_TARGET_RULES): clean-tcg-tests-%: > $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ > -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ > SRC_PATH=$(SRC_PATH) TARGET="$*" clean-guest-tests, \ >
Patchew URL: https://patchew.org/QEMU/20201003085054.332992-1-pbonzini@redhat.com/ Hi, This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally. === TEST SCRIPT BEGIN === #!/bin/bash make docker-image-centos7 V=1 NETWORK=1 time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END === The full log is available at http://patchew.org/logs/20201003085054.332992-1-pbonzini@redhat.com/testing.docker-quick@centos7/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
diff --git a/tests/Makefile.include b/tests/Makefile.include index 40d909badc..5aca98e60c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -50,21 +50,21 @@ RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) $(foreach PROBE_TARGET,$(TARGET_DIRS), \ $(eval -include $(SRC_PATH)/tests/tcg/Makefile.prereqs)) -build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-plugins) +$(BUILD_TCG_TARGET_RULES): build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-plugins) $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=$(SRC_PATH) \ V="$(V)" TARGET="$*" guest-tests, \ "BUILD", "TCG tests for $*") -run-tcg-tests-%: build-tcg-tests-% all +$(RUN_TCG_TARGET_RULES): run-tcg-tests-%: build-tcg-tests-% all $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=$(SRC_PATH) SPEED="$(SPEED)" \ V="$(V)" TARGET="$*" run-guest-tests, \ "RUN", "TCG tests for $*") -clean-tcg-tests-%: +$(CLEAN_TCG_TARGET_RULES): clean-tcg-tests-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=$(SRC_PATH) TARGET="$*" clean-guest-tests, \
Use pattern rules to clarify which targets are going to match the rule and to provide clearer error messages. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- tests/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)