diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 10:36:23 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 10:36:23 +0200 |
commit | 336ffb837705810682423b4d411c20170e56b923 (patch) | |
tree | 1323cc87ff2707265d8887694ff5ada164dcca1a | |
parent | fbede75a2580ed3561128fcaef206f58be3b010f (diff) | |
parent | 95e8ac60f8b7317ce23c648250fdc8fb68d65a07 (diff) | |
download | ffmpeg-336ffb837705810682423b4d411c20170e56b923.tar.gz |
Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'
* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07':
build: normalize coverage.info
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | tests/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 60439c9420..99be14fc77 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -166,8 +166,9 @@ fate-list: coverage.info: TAG = LCOV coverage.info: - $(M)lcov -q -d $(CURDIR) -b $(SRC_PATH) --capture | sed -e 's#/./#/#g' > $@ - $(M)lcov --remove $@ "/usr*" -o $@ + $(M)lcov -q -d $(CURDIR) -b $(SRC_PATH) --capture | \ + sed "s,$(CURDIR)/\./,$(CURDIR)/," > $@ + $(M)lcov -q --remove $@ "/usr*" -o $@ lcov: TAG = GENHTML lcov: coverage.info |