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

diff --git a/Makefile.gcov b/Makefile.gcov
index 37c1b4b44c29ce0a2a3b0471b7314bbfbf1a82ea..02774b838eaffea9f3d04eb5d31827b48a94dfab 100644 (file)
--- 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/!!'`; \