[FFmpeg-cvslog] build: use intermediate lcov coverage file
Andreas Cadhalpun
git at videolan.org
Sat Feb 6 16:25:58 CET 2016
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Wed Feb 3 00:24:26 2016 +0100| [14bf59c1d5b5fa3b4d075f481015b8110835276e] | committer: Andreas Cadhalpun
build: use intermediate lcov coverage file
Otherwise the 'lcov -q --remove' run fails with the following error:
lcov: ERROR: cannot write to coverage.info!
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14bf59c1d5b5fa3b4d075f481015b8110835276e
---
Makefile | 2 +-
tests/Makefile | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 7d8ae4b..87a9869 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ clean::
$(RM) $(CLEANSUFFIXES)
$(RM) $(CLEANSUFFIXES:%=tools/%)
$(RM) -r coverage-html
- $(RM) -rf coverage.info lcov
+ $(RM) -rf coverage.info coverage.info.in lcov
distclean::
$(RM) $(DISTCLEANSUFFIXES)
diff --git a/tests/Makefile b/tests/Makefile
index db2bc61..6e5dfa6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -217,8 +217,9 @@ fate-list:
coverage.info: TAG = LCOV
coverage.info:
$(M)lcov -q -d $(CURDIR) -b $(patsubst src%,./,$(SRC_LINK)) --capture | \
- sed "s,$(CURDIR)/\./,$(CURDIR)/," > $@
- $(M)lcov -q --remove $@ "/usr*" -o $@
+ sed "s,$(CURDIR)/\./,$(CURDIR)/," > $@.in
+ $(M)lcov -q --remove $@.in "/usr*" > $@
+ $(Q)$(RM) $@.in
lcov: TAG = GENHTML
lcov: coverage.info
More information about the ffmpeg-cvslog
mailing list