com php-src: gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give
priority to .gcda files in .libs dirs vs the files in the upper level dir: Makefile.gcov
| From: | Nuno Lopes | Date: | Sun, 18 May 2014 15:23:21 +0000 |
| Subject: | com php-src: gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir: Makefile.gcov |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78446@lists.php.net to get a copy of this message | ||
Commit: 1759905a23eb4ae0d0d3181a21da911c51d4fbf4
Author: Nuno Lopes <nlopess@php.net> Sun, 18 May 2014 11:23:21 -0400
Parents: d4295eb26a1264f6f760847f3fa1eddfbf890f7b
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1759905a23eb4ae0d0d3181a21da911c51d4fbf4
Log:
gcov: tentative fix for broken coverage data after fix for opcache coverage
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs
vs the files in the upper level dir
Changed paths:
M Makefile.gcov
Diff:
diff --git a/Makefile.gcov b/Makefile.gcov
index 37c1b4b..02774b8 100644
--- a/Makefile.gcov
+++ b/Makefile.gcov
@@ -14,7 +14,7 @@ php_lcov.info: lcov-test
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
- -@files=
find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.c -o -name \*.h |
sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e
's/\.da//g' | $(EGREP) $(LCOV_INCLUDE) | uniq ;\
+ -@files=find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.c -o -name \*.h |
sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e
's/\.da//g' | $(EGREP) $(LCOV_INCLUDE) | sed -e 's/.libs/ZZZZ/g' | sort | sed -e
's/ZZZZ/.libs/g' | uniq ;\
for x in $$files; do \
echo -n . ;\
y=echo $$x | sed -e 's!\.libs/!!'; \