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:24:22 +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-78447@lists.php.net to get a copy of this message | ||
Commit: 5164b81324ac7a9580ad1a9db690064c97fd28e3
Author: Nuno Lopes <nlopess@php.net> Sun, 18 May 2014 11:24:22 -0400
Parents: b4c92f31ad67f3ad9bef93688133838908981ad7
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5164b81324ac7a9580ad1a9db690064c97fd28e3
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/!!'; \