Patch bug52019.diff for Unknown/Other Function Bug #52019

Patch version 2010-06-11 13:33 UTC

• 2010-06-11 13:33 UTC [diff to current]

Developer: patrickallaert@php.net

Index: trunk/Makefile.gcov
===================================================================
--- trunk/Makefile.gcov	(revision 300267)
+++ trunk/Makefile.gcov	(working copy)
@@ -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
Index: branches/PHP_5_2/NEWS
===================================================================
--- branches/PHP_5_2/NEWS	(revision 300267)
+++ branches/PHP_5_2/NEWS	(working copy)
@@ -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)
Index: branches/PHP_5_2/Makefile.gcov
===================================================================
--- branches/PHP_5_2/Makefile.gcov	(revision 300267)
+++ branches/PHP_5_2/Makefile.gcov	(working copy)
@@ -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
Index: branches/PHP_5_3/NEWS
===================================================================
--- branches/PHP_5_3/NEWS	(revision 300267)
+++ branches/PHP_5_3/NEWS	(working copy)
@@ -67,6 +67,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 #51991 (spl_autoload and *nix support with namespace). (Felipe)
 - Fixed bug #51911 (ReflectionParameter::getDefaultValue() memory leaks with
   constant array). (Felipe)
Index: branches/PHP_5_3/Makefile.gcov
===================================================================
--- branches/PHP_5_3/Makefile.gcov	(revision 300267)
+++ branches/PHP_5_3/Makefile.gcov	(working copy)
@@ -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