* [Qemu-devel] [PATCH] test: Fix make target check-report.tap
@ 2019-06-04 8:00 Markus Armbruster
2019-06-04 8:09 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Markus Armbruster @ 2019-06-04 8:00 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini
Fix a fat-fingered invocation of tap-merge.pl in the recipe of target
check-report.tap.
Fixes: 9df43317b82 "test: replace gtester with a TAP driver"
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/Makefile.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 46a36c2c95..34df040583 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -904,7 +904,7 @@ check-report-unit.tap: $(check-unit-y)
# Reports and overall runs
check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
- $(call quiet-command,./scripts/tap-merge.py $^ > $@,"GEN","$@")
+ $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@")
# FPU Emulation tests (aka softfloat)
#
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] test: Fix make target check-report.tap
2019-06-04 8:00 [Qemu-devel] [PATCH] test: Fix make target check-report.tap Markus Armbruster
@ 2019-06-04 8:09 ` Philippe Mathieu-Daudé
2019-06-04 8:28 ` Paolo Bonzini
0 siblings, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-06-04 8:09 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel, pbonzini
On 6/4/19 10:00 AM, Markus Armbruster wrote:
> Fix a fat-fingered invocation of tap-merge.pl in the recipe of target
> check-report.tap.
>
> Fixes: 9df43317b82 "test: replace gtester with a TAP driver"
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> tests/Makefile.include | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 46a36c2c95..34df040583 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -904,7 +904,7 @@ check-report-unit.tap: $(check-unit-y)
> # Reports and overall runs
>
> check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
> - $(call quiet-command,./scripts/tap-merge.py $^ > $@,"GEN","$@")
> + $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@")
Paolo, did you intend to submit a new tap-merge.py script in commit
9df43317b82?
>
> # FPU Emulation tests (aka softfloat)
> #
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] test: Fix make target check-report.tap
2019-06-04 8:09 ` Philippe Mathieu-Daudé
@ 2019-06-04 8:28 ` Paolo Bonzini
2019-06-04 8:42 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2019-06-04 8:28 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Markus Armbruster, qemu-devel,
qemu-trivial@nongnu.org
On 04/06/19 10:09, Philippe Mathieu-Daudé wrote:
>> check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
>> - $(call quiet-command,./scripts/tap-merge.py $^ > $@,"GEN","$@")
>> + $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@")
> Paolo, did you intend to submit a new tap-merge.py script in commit
> 9df43317b82?
>
No, it's really just y vs l.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org
Paolo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] test: Fix make target check-report.tap
2019-06-04 8:28 ` Paolo Bonzini
@ 2019-06-04 8:42 ` Philippe Mathieu-Daudé
2019-06-06 9:23 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
0 siblings, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-06-04 8:42 UTC (permalink / raw)
To: Paolo Bonzini, Markus Armbruster, qemu-devel,
qemu-trivial@nongnu.org
On 6/4/19 10:28 AM, Paolo Bonzini wrote:
> On 04/06/19 10:09, Philippe Mathieu-Daudé wrote:
>>> check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
>>> - $(call quiet-command,./scripts/tap-merge.py $^ > $@,"GEN","$@")
>>> + $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@")
>> Paolo, did you intend to submit a new tap-merge.py script in commit
>> 9df43317b82?
>>
>
> No, it's really just y vs l.
OK!
>
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> Cc: qemu-trivial@nongnu.org
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH] test: Fix make target check-report.tap
2019-06-04 8:42 ` Philippe Mathieu-Daudé
@ 2019-06-06 9:23 ` Laurent Vivier
0 siblings, 0 replies; 5+ messages in thread
From: Laurent Vivier @ 2019-06-06 9:23 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Paolo Bonzini, Markus Armbruster,
qemu-devel, qemu-trivial@nongnu.org
Le 04/06/2019 à 10:42, Philippe Mathieu-Daudé a écrit :
> On 6/4/19 10:28 AM, Paolo Bonzini wrote:
>> On 04/06/19 10:09, Philippe Mathieu-Daudé wrote:
>>>> check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
>>>> - $(call quiet-command,./scripts/tap-merge.py $^ > $@,"GEN","$@")
>>>> + $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@")
>>> Paolo, did you intend to submit a new tap-merge.py script in commit
>>> 9df43317b82?
>>>
>>
>> No, it's really just y vs l.
>
> OK!
>
>>
>> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
>> Cc: qemu-trivial@nongnu.org
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-06-06 9:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-04 8:00 [Qemu-devel] [PATCH] test: Fix make target check-report.tap Markus Armbruster
2019-06-04 8:09 ` Philippe Mathieu-Daudé
2019-06-04 8:28 ` Paolo Bonzini
2019-06-04 8:42 ` Philippe Mathieu-Daudé
2019-06-06 9:23 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).