Skip to contentSkip to conversation

test: Fix make target check-report.tap

PATCH Applied Markus Armbruster 4 participants 5 messages Jun 4, 2019 – Jun 6, 2019

lore
Share & tools
lore
#0 lore raw

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.

Fixes 9df43317b82 "test: replace gtester with a TAP driver"
---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +1 -1
index 46a36c2c95..34df040583 100644
@@ -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
#1 lore raw
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"
---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +0 -0
index 46a36c2c95..34df040583 100644

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)
 #
 
Reviewed-by
#2 lore raw
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.py script in commit 9df43317b82?

No, it's really just y vs l.

Paolo

Reviewed-by Tested-by
#3 lore raw
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.py script in commit 9df43317b82?

No, it's really just y vs l.

OK!

Quoted 3 lines
#4 lore raw

Le 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.py script in commit 9df43317b82?

No, it's really just y vs l.

Quoted 9 lines

OK!

Quoted 3 lines

Applied to my trivial-patches branch.

Thanks,
Laurent