test: Fix make target check-report.tap
PATCH 1/1 test: Fix make target check-report.tap
Fix a fat-fingered invocation of tap-merge.pl in the recipe of target check-report.tap.
--- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +1 -1
@@ -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) #
Signature · 1 line
2.21.0
Quoted 14 lines · Markus Armbruster
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 <[email protected]>--- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/Makefile.include +0
-0
tests/Makefile.include check-report-unit.tap: $(check-unit-y) · line 907
Quoted 5 lines
tests/Makefile.include +1
-1@@ -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?
Quoted 4 lines
tests/Makefile.include +0
-0# FPU Emulation tests (aka softfloat) #
Paolo Bonzini
Reviewed-byQuoted 6 lines · Philippe Mathieu-Daudé
tests/Makefile.include check-report-unit.tap: $(check-unit-y) · line 907
Quoted 3 lines
check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
tests/Makefile.include +1
-1- $(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.pyscript in commit9df43317b82?
No, it's really just y vs l.
Paolo
Quoted 9 lines · Paolo Bonzini
Quoted 6 lines · Philippe Mathieu-Daudé
tests/Makefile.include check-report-unit.tap: $(check-unit-y) · line 907
Quoted 3 lines
check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
tests/Makefile.include +1
-1- $(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.pyscript in commit9df43317b82?No, it's really just y vs l.
OK!
Quoted 3 lines
Reviewed-by Paolo Bonzini <[email protected]>
Laurent Vivier
AppliedLe 04/06/2019 à 10:42, Philippe Mathieu-Daudé a écrit :
Quoted 11 lines · Paolo Bonzini
Quoted 9 lines · Philippe Mathieu-Daudé
Quoted 6 lines
tests/Makefile.include check-report-unit.tap: $(check-unit-y) · line 907
Quoted 3 lines
check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap
tests/Makefile.include +1
-1- $(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.pyscript in commit9df43317b82?No, it's really just y vs l.
Quoted 9 lines
OK!
Quoted 3 lines
Reviewed-by Paolo Bonzini <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Applied to my trivial-patches branch.
Thanks,
Laurent