iliaa Thu Dec 8 11:00:30 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src configure.in Makefile.gcov
Log:
Final fix for gcov generation.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.27&r2=1.579.2.28&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.27 php-src/configure.in:1.579.2.28
--- php-src/configure.in:1.579.2.27 Wed Nov 30 16:53:20 2005
+++ php-src/configure.in Thu Dec 8 11:00:25 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.27 2005/11/30 21:53:20 helly Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.28 2005/12/08 16:00:25 iliaa Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -617,7 +617,7 @@
AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used.
You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
fi
- ltp_version_list="1.4"
+ ltp_version_list="1.5"
AC_CHECK_PROG(LTP, lcov, lcov)
AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.4.2.6&r2=1.4.2.7&ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.4.2.6 php-src/Makefile.gcov:1.4.2.7
--- php-src/Makefile.gcov:1.4.2.6 Sun Dec 4 23:22:16 2005
+++ php-src/Makefile.gcov Thu Dec 8 11:00:28 2005
@@ -57,7 +57,7 @@
done
@echo
@echo "Generating $@"
- @$(LTP) --directory lcov_data/ --capture --output-file $@ --test-name
PHP_LCOV
+ @$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data
--output-file $@
lcov-html: php_lcov.info
@echo "Generating lcov HTML"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
