diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-04 15:58:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-04 15:58:46 +0100 |
| commit | 234e256511e588680300600ce087c5185d68cf2a (patch) | |
| tree | 172ffea72fc1ffa5704e125a082ecfb7f4c47f30 /tests | |
| parent | be8bf83d1f0b589767e6e85e3e197b00c2850374 (diff) | |
| parent | 1338a4b72659ce08eacb9de0205fe16202a22d9c (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-build-2019-07-02-v2' into staging
Build system patches for 2019-07-02
# gpg: Signature made Wed 03 Jul 2019 12:44:28 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-build-2019-07-02-v2:
Makefile: Reuse all's recursion machinery for clean and install
Makefile: Rename targets for make recursion
Makefile: Drop bogus cleaning of $(ALL_SUBDIRS)/qemu-options.def
Makefile: Remove code to smooth transition to config.status
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index d02132fb94..a983dd32da 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1,3 +1,4 @@ +# -*- Mode: makefile -*- .PHONY: check-help check-help: @@ -892,7 +893,7 @@ define do_test_tap endef .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) -$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: subdir-%-softmmu $(check-qtest-y) +$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/all $(check-qtest-y) $(call do_test_human,$(check-qtest-$*-y) $(check-qtest-generic-y), \ QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF)) @@ -905,7 +906,7 @@ check-speed: $(check-speed-y) # gtester tests with TAP output -$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qtest-%.tap: subdir-%-softmmu $(check-qtest-y) +$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qtest-%.tap: %-softmmu/all $(check-qtest-y) $(call do_test_tap, $(check-qtest-$*-y) $(check-qtest-generic-y), \ QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF)) |