sniper Tue Nov 8 11:43:10 2005 EDT
Modified files:
/php-src .cvsignore Makefile.gcov NEWS
Log:
- Fixed --enable-gcov to work with VPATH builds too
http://cvs.php.net/diff.php/php-src/.cvsignore?r1=1.51&r2=1.52&ty=u
Index: php-src/.cvsignore
diff -u php-src/.cvsignore:1.51 php-src/.cvsignore:1.52
--- php-src/.cvsignore:1.51 Sun Oct 10 12:09:28 2004
+++ php-src/.cvsignore Tue Nov 8 11:43:09 2005
@@ -66,3 +66,7 @@
php_test_results_*.txt
*.gcda
*.gcno
+php_lcov.info
+lcov_data
+lcov_html
+
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.1&r2=1.2&ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.1 php-src/Makefile.gcov:1.2
--- php-src/Makefile.gcov:1.1 Wed Oct 19 20:18:23 2005
+++ php-src/Makefile.gcov Tue Nov 8 11:43:09 2005
@@ -1,18 +1,41 @@
-.php_cov_info.ltpdata:
- @mkdir -p .cov/; \
- find . -name \*.gcda -o -name \*.gcno | sed -e 's/^\.\/\.cov\/.*//' |
xargs --replace cp {} .cov/; \
- find . -name \*.gcda -o -name \*.gcno | sed -e 's/^\.\/\.cov\/.*//' |
sed -e 's/^\.\///' | xargs --max-args=1 dirname | sed -e 's/\/.*//' | xargs
--replace ln -s `pwd`/{} `pwd`/.cov > /dev/null 2>&1; \
- $(LTP) --directory .cov --output-file=.php_cov_info.ltpdata --capture; \
+#
+# LCOV
+#
-cov: .php_cov_info.ltpdata
+lcov: php_lcov.info
-cov-html: cov
- @$(LTP_GENHTML) -o cov_html/ .php_cov_info.ltpdata -t "PHP Code
Coverage" -s;
+php_lcov.info:
+ @echo "Generating data for $@"
+ @rm -rf lcov_data/
+ @$(mkinstalldirs) lcov_data/
+ @echo
+ [EMAIL PROTECTED] . -name \*.gcda -o -name \*.gcno | sed -e 's/^\.\///'
| sed -e 's/\.gcda//g' -e 's/\.gcno//g' | uniq | while read x; do \
+ echo -n . ;\
+ dir=lcov_data/`dirname $$x`; \
+ test -d "$$dir" || $(mkinstalldirs) "$$dir"; \
+ if test -f "$(top_srcdir)/$$x.c"; then \
+ ln -f -s $(top_srcdir)/$$x.c lcov_data/$$x.c; \
+ fi; \
+ if test -f "$(top_srcdir)/$$x.re"; then \
+ ln -f -s $(top_srcdir)/$$x.re lcov_data/$$x.re; \
+ fi; \
+ if test -f "$(top_builddir)/$$x.c"; then \
+ ln -f -s $(top_builddir)/$$x.c lcov_data/$$x.c; \
+ fi; \
+ test -f "$$x.gcno" && cp $$x.gcno lcov_data/ ; \
+ test -f "$$x.gcda" && cp $$x.gcda lcov_data/ ; \
+ done
+ @echo
+ @echo "Generating $@"
+ @$(LTP) --directory lcov_data/ --capture --output-file $@ --test-name
PHP_LCOV
+
+lcov-html: php_lcov.info
+ @echo "Generating lcov HTML"
+ @$(LTP_GENHTML) --no-prefix --output-directory lcov_html/ --title "PHP
Code Coverage" --show-details php_lcov.info
+
+lcov-clean:
+ rm -f php_lcov.info
+ rm -rf lcov_data/
+ rm -rf lcov_html/
-cov-clean:
- find . -name \*.gcda -o -name \*.gcno -exec rm -f {} \;
- rm -f .cov/* # This is done first, since we are symlinked inside..
- rm -Rf .cov # Now remove the directory
- rm -f .php_cov_info.ltpdata
- rm -Rf cov_html
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2074&r2=1.2075&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2074 php-src/NEWS:1.2075
--- php-src/NEWS:1.2074 Tue Nov 1 02:20:49 2005
+++ php-src/NEWS Tue Nov 8 11:43:09 2005
@@ -8,7 +8,8 @@
(Marcus, Dmitry)
- Changed "instanceof" and "catch" operators, is_a() and is_subclass_of()
functions to not call __autoload(). (Dmitry)
-- Added configure option to enable C-level Code Coverage Instrumenting. (John)
+- Added --enable-gcov configure option to enable C-level code coverage.
+ (John, Jani)
- Added to cURL extension: (Ilia)
. curl_setopt_array() which allows setting of multiple cURL options.
. CURLINFO_HEADER_OUT constant to facilitate request retrieval.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
