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:21:05 +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-78445@lists.php.net to get a copy of this message | ||
Commit: 4f8a84b2e70af341560e271a824159bf9b814cf9
Author: Nuno Lopes <nlopess@php.net> Sun, 18 May 2014 11:21:05 -0400
Parents: 6aac353accfb205bf555d2edfb7255b42ee6fc73
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4f8a84b2e70af341560e271a824159bf9b814cf9
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/!!'; \