On 28/05/19 10:11, Markus Armbruster wrote: > Commit 9df43317b82 "test: replace gtester with a TAP driver" replaced > targets check-report.xml and check-report.html by > > check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) > check-report-unit.tap > $(call quiet-command,./scripts/tap-merge.py $^ > $@,"GEN","$@") > > This never worked: scripts/tap-merge.py does not exist. > > Perhaps it accidentally wasn't committed. > > Perhaps it's just a typoed tap-merge.pl. But that one reads its intput > from stdin. Possible fix appended.
Indeed that's the right one. Paolo > Paolo, please advise. > > > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 1a3f17faa9..54d888fc5c 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -905,7 +905,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) > # >
