Skip to content

Commit c3735e5

Browse files
committed
Merge bitcoin/bitcoin#28771: tests: Fix LCOV_OPTS to be in the correct position
88e09ac tests: Fix LCOV_OPTS to be in the correct position (Andrew Chow) Pull request description: `lcov`'s `-a` option takes an argument. With `LCOV_OPTS` immediately after `-a`, the first additional argument becomes the argument to `-a` which is incorrect. Also add `LCOV_OPTS` to more `lcov` calls. ACKs for top commit: fanquake: ACK 88e09ac Tree-SHA512: 1ed657c96395bfe882041ded883cb5fa4d04d6ede91f66c319b5bbdd1f88468f8abb2a741dd7898904a78ed7e6c844316f7958ce9e4ccf2dbe666ebec308b7fb
2 parents 04e871d + 88e09ac commit c3735e5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ $(COV_TOOL_WRAPPER):
187187
@chmod +x $(COV_TOOL_WRAPPER)
188188

189189
baseline.info: $(COV_TOOL_WRAPPER)
190-
$(LCOV) -c -i -d $(abs_builddir)/src -o $@
190+
$(LCOV) $(LCOV_OPTS) -c -i -d $(abs_builddir)/src -o $@
191191

192192
baseline_filtered.info: baseline.info
193193
$(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@
@@ -221,13 +221,13 @@ functional_test_filtered.info: functional_test.info
221221
$(LCOV) -a $@ $(LCOV_OPTS) -o $@
222222

223223
fuzz_coverage.info: fuzz_filtered.info
224-
$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a fuzz_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
224+
$(LCOV) $(LCOV_OPTS) -a baseline_filtered.info -a fuzz_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
225225

226226
test_bitcoin_coverage.info: baseline_filtered.info test_bitcoin_filtered.info
227-
$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_bitcoin_filtered.info -o $@
227+
$(LCOV) $(LCOV_OPTS) -a baseline_filtered.info -a test_bitcoin_filtered.info -o $@
228228

229229
total_coverage.info: test_bitcoin_filtered.info functional_test_filtered.info
230-
$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_bitcoin_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
230+
$(LCOV) $(LCOV_OPTS) -a baseline_filtered.info -a test_bitcoin_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
231231

232232
fuzz.coverage/.dirstamp: fuzz_coverage.info
233233
$(GENHTML) -s $(LCOV_OPTS) $< -o $(@D)

0 commit comments

Comments
 (0)