svn: /php/php-src/ branches/PHP_5_2/Makefile.gcov branches/PHP_5_2/NEWS branches/PHP_5_3/Makefile.gcov branches/PHP_5_3/NEWS trunk/Makefile.gcov

patrickallaert Fri, 11 Jun 2010 14:04:57 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=300385 Log: - Fixed bug #52019 (make lcov doesn't support TESTS variable anymore) Bug: http://bugs.php.net/52019 (Assigned) make lcov doesn't support TESTS variable anymore Changed paths: U php/php-src/branches/PHP_5_2/Makefile.gcov U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_3/Makefile.gcov U php/php-src/branches/PHP_5_3/NEWS U php/php-src/trunk/Makefile.gcov Modified: php/php-src/branches/PHP_5_2/Makefile.gcov =================================================================== --- php/php-src/branches/PHP_5_2/Makefile.gcov 2010-06-11 13:56:01 UTC (rev 300384) +++ php/php-src/branches/PHP_5_2/Makefile.gcov 2010-06-11 14:04:57 UTC (rev 300385) @@ -5,24 +5,7 @@ lcov: lcov-html -lcov-test: all - @echo "Running test suite" - @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f - -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ - NO_INTERACTION=1 \ - TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ - CC="$(CC)" \ - $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d ( . $(PHP_MODULES) ; echo extension=$$dlname) tests/; \ - elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ - NO_INTERACTION=1 \ - TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ - CC="$(CC)" \ - $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \ - else \ - echo "ERROR: Cannot run tests without CLI sapi."; \ - fi +lcov-test: lcov-clean-data test php_lcov.info: lcov-test @echo "Generating data for $@" @@ -74,3 +57,5 @@ rm -rf lcov_data/ rm -rf lcov_html/ +lcov-clean-data: + @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2010-06-11 13:56:01 UTC (rev 300384) +++ php/php-src/branches/PHP_5_2/NEWS 2010-06-11 14:04:57 UTC (rev 300385) @@ -18,6 +18,7 @@ - Fixed a possible arbitrary memory access inside sqlite extension. Reported by Mateusz Kocielski. (Ilia) +- Fixed bug #52019 (make lcov doesn't support TESTS variable anymore). (Patrick) - Fixed bug #51911 (ReflectionParameter::getDefaultValue() memory leaks with - Fixed bug #51905 (ReflectionParameter fails if default value is an array with an access to self::). (Felipe) Modified: php/php-src/branches/PHP_5_3/Makefile.gcov =================================================================== --- php/php-src/branches/PHP_5_3/Makefile.gcov 2010-06-11 13:56:01 UTC (rev 300384) +++ php/php-src/branches/PHP_5_3/Makefile.gcov 2010-06-11 14:04:57 UTC (rev 300385) @@ -5,24 +5,7 @@ lcov: lcov-html -lcov-test: all - @echo "Running test suite" - @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f - -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ - NO_INTERACTION=1 \ - TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ - CC="$(CC)" \ - $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d ( . $(PHP_MODULES) ; echo extension=$$dlname) tests/; \ - elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ - NO_INTERACTION=1 \ - TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ - CC="$(CC)" \ - $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \ - else \ - echo "ERROR: Cannot run tests without CLI sapi."; \ - fi +lcov-test: lcov-clean-data test php_lcov.info: lcov-test @echo "Generating data for $@" @@ -77,3 +60,5 @@ rm -rf lcov_data/ rm -rf lcov_html/ +lcov-clean-data: + @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-06-11 13:56:01 UTC (rev 300384) +++ php/php-src/branches/PHP_5_3/NEWS 2010-06-11 14:04:57 UTC (rev 300385) @@ -71,6 +71,7 @@ requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert) - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) +- Fixed bug #52019 (make lcov doesn't support TESTS variable anymore). (Patrick) - Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command). (Ilia) - Fixed bug #52001 (Memory allocation problems after using variable variables). Modified: php/php-src/trunk/Makefile.gcov =================================================================== --- php/php-src/trunk/Makefile.gcov 2010-06-11 13:56:01 UTC (rev 300384) +++ php/php-src/trunk/Makefile.gcov 2010-06-11 14:04:57 UTC (rev 300385) @@ -5,24 +5,7 @@ lcov: lcov-html -lcov-test: all - @echo "Running test suite" - @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f - -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ - NO_INTERACTION=1 \ - TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ - CC="$(CC)" \ - $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d ( . $(PHP_MODULES) ; echo extension=$$dlname) tests/; \ - elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ - NO_INTERACTION=1 \ - TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ - CC="$(CC)" \ - $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \ - else \ - echo "ERROR: Cannot run tests without CLI sapi."; \ - fi +lcov-test: lcov-clean-data test php_lcov.info: lcov-test @echo "Generating data for $@" @@ -77,3 +60,5 @@ rm -rf lcov_data/ rm -rf lcov_html/ +lcov-clean-data: + @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f