1. Patchew
  2. QEMU
  3. View series

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

Dario Faggioli posted 1 patch 1 year, 11 months ago
Failed in applying to current master (apply log)
tests/Makefile.include |   30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
[PATCH] tests/Makefile.include: Fix 'make check-help' output
Posted by Dario Faggioli 1 year, 11 months ago 
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>
---
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/Makefile.include |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index ec84b2ebc0..5caa3836ad 100644
--- 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 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 "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."
Re: [PATCH] tests/Makefile.include: Fix 'make check-help' output
Posted by Paolo Bonzini 1 year, 11 months ago 
> +	@echo " $(MAKE) check-report.junit.xml Generates an aggregated TAP test report"

XML now rather than TAP; tweaked and queued, thanks.

Paolo
Re: [PATCH] tests/Makefile.include: Fix 'make check-help' output
Posted by Philippe Mathieu-Daudé via 1 year, 11 months ago 
On 27/5/22 17:30, Dario Faggioli wrote:
> 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>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   tests/Makefile.include |   30 +++++++++++++++---------------
>   1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index ec84b2ebc0..5caa3836ad 100644
> --- 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 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 "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."
> 
> 
>

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.