tests/Makefile.include: Fix 'make check-help' output

Since commit 3d2f73ef75e ("build: use "meson test" as the test harness"),
check-report.tap is no more, and we have check-report.junit.xml.

Update the output of 'make check-help', which was still listing
'check-report.tap', accordingly.

Fixes: 3d2f73ef75e
Signed-off-by: Dario Faggioli <dfaggioli@suse.com>
Message-Id: <165366545439.6869.11633009118019728798.stgit@work>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 6a1688e33ed98297dcb492ec5d57fda48a5d941b..2a1c77440a0bd66df08830fd23b8bac7ca6449fd 100644 (file)
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -3,28 +3,28 @@
 .PHONY: check-help
 check-help:
        @echo "Regression testing targets:"
-       @echo " $(MAKE) check                Run block, qapi-schema, unit, softfloat, qtest and decodetree tests"
-       @echo " $(MAKE) bench                Run speed tests"
+       @echo " $(MAKE) check                  Run block, qapi-schema, unit, softfloat, qtest and decodetree tests"
+       @echo " $(MAKE) bench                  Run speed tests"
        @echo
        @echo "Individual test suites:"
-       @echo " $(MAKE) check-qtest-TARGET   Run qtest tests for given target"
-       @echo " $(MAKE) check-qtest          Run qtest tests"
-       @echo " $(MAKE) check-unit           Run qobject tests"
-       @echo " $(MAKE) check-qapi-schema    Run QAPI schema tests"
-       @echo " $(MAKE) check-block          Run block tests"
+       @echo " $(MAKE) check-qtest-TARGET     Run qtest tests for given target"
+       @echo " $(MAKE) check-qtest            Run qtest tests"
+       @echo " $(MAKE) check-unit             Run qobject tests"
+       @echo " $(MAKE) check-qapi-schema      Run QAPI schema tests"
+       @echo " $(MAKE) check-block            Run block tests"
 ifneq ($(filter $(all-check-targets), check-softfloat),)
-       @echo " $(MAKE) check-tcg            Run TCG tests"
-       @echo " $(MAKE) check-softfloat      Run FPU emulation tests"
+       @echo " $(MAKE) check-tcg              Run TCG tests"
+       @echo " $(MAKE) check-softfloat        Run FPU emulation tests"
 endif
-       @echo " $(MAKE) check-avocado        Run avocado (integration) tests for currently configured targets"
+       @echo " $(MAKE) check-avocado          Run avocado (integration) tests for currently configured targets"
        @echo
-       @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 " $(MAKE) check-report.junit.xml Generates an aggregated XML test report"
+       @echo " $(MAKE) check-venv             Creates a Python venv for tests"
+       @echo " $(MAKE) check-clean            Clean the tests and related data"
        @echo
        @echo "The following are useful for CI builds"
-       @echo " $(MAKE) check-build          Build most test binaries"
-       @echo " $(MAKE) get-vm-images        Downloads all images used by avocado tests, according to configured targets (~350 MB each, 1.5 GB max)"
+       @echo " $(MAKE) check-build            Build most test binaries"
+       @echo " $(MAKE) get-vm-images          Downloads all images used by avocado tests, according to configured targets (~350 MB each, 1.5 GB max)"
        @echo
        @echo
        @echo "The variable SPEED can be set to control the gtester speed setting."