Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-02-03 02:24:26 +0300
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-02-06 17:42:09 +0300
commit14bf59c1d5b5fa3b4d075f481015b8110835276e (patch)
tree2af595e505e51ef006815c9ffbf0eb21e028da4d
parentbb7522ce67e59271c928fc85ace6cd2d86aa131f (diff)
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@googlemail.com>
-rw-r--r--Makefile2
-rw-r--r--tests/Makefile5
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7d8ae4bb22..87a9869657 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 db2bc61e76..6e5dfa6e1b 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