* [Qemu-devel] [PATCH] Makefile: Let "make check-help" work without running ./configure
@ 2017-08-10 8:50 Fam Zheng
2017-08-10 11:59 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 4+ messages in thread
From: Fam Zheng @ 2017-08-10 8:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé
Currently if you do "make check-help" in a fresh checkout, only an error
is printed which is not nice:
$ make check-help V=1
cc -nostdlib -o check-help.mo
cc: fatal error: no input files
compilation terminated.
rules.mak:115: recipe for target 'check-help.mo' failed
make: *** [check-help.mo] Error 1
Move the config-host.mak condition into the body of
tests/Makefile.include and always include the rule for check-help.
Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
Makefile | 2 --
tests/Makefile.include | 46 +++++++++++++++++++++++++---------------------
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index 97a58a0f4e..81447b1f08 100644
--- a/Makefile
+++ b/Makefile
@@ -281,9 +281,7 @@ dummy := $(call unnest-vars,, \
common-obj-m \
trace-obj-y)
-ifneq ($(wildcard config-host.mak),)
include $(SRC_PATH)/tests/Makefile.include
-endif
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
diff --git a/tests/Makefile.include b/tests/Makefile.include
index eb4895f94a..37c1bed683 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1,3 +1,26 @@
+
+.PHONY: check-help
+check-help:
+ @echo "Regression testing targets:"
+ @echo
+ @echo " make check Run all 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-speed Run qobject speed tests"
+ @echo " make check-qapi-schema Run QAPI schema tests"
+ @echo " make check-block Run block tests"
+ @echo " make check-report.html Generates an HTML test report"
+ @echo " make check-clean Clean the tests"
+ @echo
+ @echo "Please note that HTML reports do not regenerate if the unit tests"
+ @echo "has 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"
+ @echo "changed with variable GTESTER_OPTIONS."
+
+ifneq ($(wildcard config-host.mak),)
export SRC_PATH
qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
@@ -802,27 +825,6 @@ $(check-qtest-y): $(qtest-obj-y)
tests/test-qga: tests/test-qga.o $(qtest-obj-y)
-.PHONY: check-help
-check-help:
- @echo "Regression testing targets:"
- @echo
- @echo " make check Run all 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-speed Run qobject speed tests"
- @echo " make check-qapi-schema Run QAPI schema tests"
- @echo " make check-block Run block tests"
- @echo " make check-report.html Generates an HTML test report"
- @echo " make check-clean Clean the tests"
- @echo
- @echo "Please note that HTML reports do not regenerate if the unit tests"
- @echo "has 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"
- @echo "changed with variable GTESTER_OPTIONS."
-
SPEED = quick
GTESTER_OPTIONS = -k $(if $(V),--verbose,-q)
GCOV_OPTIONS = -n $(if $(V),-f,)
@@ -917,3 +919,5 @@ all: $(QEMU_IOTESTS_HELPERS-y)
-include $(wildcard tests/*.d)
-include $(wildcard tests/libqos/*.d)
+
+endif
--
2.13.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile: Let "make check-help" work without running ./configure
2017-08-10 8:50 [Qemu-devel] [PATCH] Makefile: Let "make check-help" work without running ./configure Fam Zheng
@ 2017-08-10 11:59 ` Philippe Mathieu-Daudé
2017-08-15 7:09 ` Fam Zheng
0 siblings, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-10 11:59 UTC (permalink / raw)
To: Fam Zheng, qemu-devel, Alex Bennée
Hi Fam,
thank for fixing this :)
I think as a bugfix it should enter 2.10
(maybe through Alex's Travis series, CC'ing him)
On 08/10/2017 05:50 AM, Fam Zheng wrote:
> Currently if you do "make check-help" in a fresh checkout, only an error
> is printed which is not nice:
>
> $ make check-help V=1
> cc -nostdlib -o check-help.mo
> cc: fatal error: no input files
> compilation terminated.
> rules.mak:115: recipe for target 'check-help.mo' failed
> make: *** [check-help.mo] Error 1
>
> Move the config-host.mak condition into the body of
> tests/Makefile.include and always include the rule for check-help.
>
> Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> Makefile | 2 --
> tests/Makefile.include | 46 +++++++++++++++++++++++++---------------------
> 2 files changed, 25 insertions(+), 23 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 97a58a0f4e..81447b1f08 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -281,9 +281,7 @@ dummy := $(call unnest-vars,, \
> common-obj-m \
> trace-obj-y)
>
> -ifneq ($(wildcard config-host.mak),)
> include $(SRC_PATH)/tests/Makefile.include
> -endif
>
> all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index eb4895f94a..37c1bed683 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -1,3 +1,26 @@
> +
> +.PHONY: check-help
> +check-help:
> + @echo "Regression testing targets:"
> + @echo
> + @echo " make check Run all 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-speed Run qobject speed tests"
> + @echo " make check-qapi-schema Run QAPI schema tests"
> + @echo " make check-block Run block tests"
> + @echo " make check-report.html Generates an HTML test report"
> + @echo " make check-clean Clean the tests"
> + @echo
> + @echo "Please note that HTML reports do not regenerate if the unit tests"
> + @echo "has 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"
> + @echo "changed with variable GTESTER_OPTIONS."
> +
> +ifneq ($(wildcard config-host.mak),)
> export SRC_PATH
>
> qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
> @@ -802,27 +825,6 @@ $(check-qtest-y): $(qtest-obj-y)
>
> tests/test-qga: tests/test-qga.o $(qtest-obj-y)
>
> -.PHONY: check-help
> -check-help:
> - @echo "Regression testing targets:"
> - @echo
> - @echo " make check Run all 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-speed Run qobject speed tests"
> - @echo " make check-qapi-schema Run QAPI schema tests"
> - @echo " make check-block Run block tests"
> - @echo " make check-report.html Generates an HTML test report"
> - @echo " make check-clean Clean the tests"
> - @echo
> - @echo "Please note that HTML reports do not regenerate if the unit tests"
> - @echo "has 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"
> - @echo "changed with variable GTESTER_OPTIONS."
> -
> SPEED = quick
> GTESTER_OPTIONS = -k $(if $(V),--verbose,-q)
> GCOV_OPTIONS = -n $(if $(V),-f,)
> @@ -917,3 +919,5 @@ all: $(QEMU_IOTESTS_HELPERS-y)
>
> -include $(wildcard tests/*.d)
> -include $(wildcard tests/libqos/*.d)
> +
> +endif
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile: Let "make check-help" work without running ./configure
2017-08-10 11:59 ` Philippe Mathieu-Daudé
@ 2017-08-15 7:09 ` Fam Zheng
2017-08-15 9:32 ` Alex Bennée
0 siblings, 1 reply; 4+ messages in thread
From: Fam Zheng @ 2017-08-15 7:09 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-devel, Alex Bennée
On Thu, 08/10 08:59, Philippe Mathieu-Daudé wrote:
> Hi Fam,
>
> thank for fixing this :)
>
> I think as a bugfix it should enter 2.10
> (maybe through Alex's Travis series, CC'ing him)
Since Alex hasn't replied, I'll send a pull request for -rc3.
>
> On 08/10/2017 05:50 AM, Fam Zheng wrote:
> > Currently if you do "make check-help" in a fresh checkout, only an error
> > is printed which is not nice:
> >
> > $ make check-help V=1
> > cc -nostdlib -o check-help.mo
> > cc: fatal error: no input files
> > compilation terminated.
> > rules.mak:115: recipe for target 'check-help.mo' failed
> > make: *** [check-help.mo] Error 1
> >
> > Move the config-host.mak condition into the body of
> > tests/Makefile.include and always include the rule for check-help.
> >
> > Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > Signed-off-by: Fam Zheng <famz@redhat.com>
>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
Fam
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile: Let "make check-help" work without running ./configure
2017-08-15 7:09 ` Fam Zheng
@ 2017-08-15 9:32 ` Alex Bennée
0 siblings, 0 replies; 4+ messages in thread
From: Alex Bennée @ 2017-08-15 9:32 UTC (permalink / raw)
To: Fam Zheng; +Cc: Philippe Mathieu-Daudé, qemu-devel
Fam Zheng <famz@redhat.com> writes:
> On Thu, 08/10 08:59, Philippe Mathieu-Daudé wrote:
>> Hi Fam,
>>
>> thank for fixing this :)
>>
>> I think as a bugfix it should enter 2.10
>> (maybe through Alex's Travis series, CC'ing him)
>
> Since Alex hasn't replied, I'll send a pull request for -rc3.
Yes please. Sorry I got distracted by other stuff.
>
>>
>> On 08/10/2017 05:50 AM, Fam Zheng wrote:
>> > Currently if you do "make check-help" in a fresh checkout, only an error
>> > is printed which is not nice:
>> >
>> > $ make check-help V=1
>> > cc -nostdlib -o check-help.mo
>> > cc: fatal error: no input files
>> > compilation terminated.
>> > rules.mak:115: recipe for target 'check-help.mo' failed
>> > make: *** [check-help.mo] Error 1
>> >
>> > Move the config-host.mak condition into the body of
>> > tests/Makefile.include and always include the rule for check-help.
>> >
>> > Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> > Signed-off-by: Fam Zheng <famz@redhat.com>
>>
>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>
>
> Fam
--
Alex Bennée
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-15 9:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-10 8:50 [Qemu-devel] [PATCH] Makefile: Let "make check-help" work without running ./configure Fam Zheng
2017-08-10 11:59 ` Philippe Mathieu-Daudé
2017-08-15 7:09 ` Fam Zheng
2017-08-15 9:32 ` Alex Bennée
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.