Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[mirror_qemu.git] / tests / Makefile.include

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 82dab2a36ab4a61b29ba7f841bcc68cb4e7bd22d..31b86674e53bc084a189f9c7f6a8ab86e67b4b00 100644 (file)
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -16,12 +16,10 @@ check-help:
        @echo " $(MAKE) check-softfloat      Run FPU emulation tests"
        @echo " $(MAKE) check-acceptance     Run all acceptance (functional) tests"
        @echo
-       @echo " $(MAKE) check-report.html    Generates an HTML test report"
+       @echo " $(MAKE) check-report.tap     Generates an aggregated TAP test report"
        @echo " $(MAKE) check-venv           Creates a Python venv for tests"
        @echo " $(MAKE) check-clean          Clean the tests and related data"
        @echo
-       @echo "Please note that HTML reports do not regenerate if the unit tests"
-       @echo "have not changed."
        @echo
        @echo "The variable SPEED can be set to control the gtester speed setting."
        @echo "Default options are -k and (for $(MAKE) V=1) --verbose; they can be"
@@ -169,7 +167,7 @@ check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
 check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
 check-qtest-i386-y += tests/fdc-test$(EXESUF)
 check-qtest-i386-y += tests/ide-test$(EXESUF)
-check-qtest-i386-y += tests/ahci-test$(EXESUF)
+check-qtest-i386-$(CONFIG_TOOLS) += tests/ahci-test$(EXESUF)
 check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
 check-qtest-i386-y += tests/boot-order-test$(EXESUF)
 check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
@@ -1193,7 +1191,9 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
 .PHONY: check-block check-qapi-schema check-qtest check-unit check check-clean
 check-qapi-schema: check-tests/qapi-schema/frontend check-tests/qapi-schema/doc-good.texi
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
+ifeq ($(CONFIG_TOOLS),y)
 check-block: $(patsubst %,check-%, $(check-block-y))
+endif
 check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
 check-clean:
        rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)