test: Fix make target check-report.tap

[Qemu-devel] [PATCH] test: Fix make target check-report.tap

Posted by Markus Armbruster 4 years, 10 months ago

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

Re: [Qemu-devel] [PATCH] test: Fix make target check-report.tap

Posted by Philippe Mathieu-Daudé 4 years, 10 months ago

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)
>  #
>

Re: [Qemu-devel] [PATCH] test: Fix make target check-report.tap

Posted by Paolo Bonzini 4 years, 10 months ago

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

Re: [Qemu-devel] [PATCH] test: Fix make target check-report.tap

Posted by Philippe Mathieu-Daudé 4 years, 10 months ago

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>

Re: [Qemu-devel] [Qemu-trivial] [PATCH] test: Fix make target check-report.tap

Posted by Laurent Vivier 4 years, 10 months ago

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