- Fixed bug #52019 (make lcov doesn't support TESTS variable anymore)

diff --git a/Makefile.gcov b/Makefile.gcov
index 01dad161136b41dcf54b49776d2f7d49bc87fcaf..e499c833bbeaec8ad6d97f389205b7cf944e8f4e 100644 (file)
--- a/Makefile.gcov
+++ b/Makefile.gcov
@@ -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 @@ lcov-clean:
        rm -rf lcov_data/
        rm -rf lcov_html/
 
+lcov-clean-data:
+       @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f

diff --git a/NEWS b/NEWS
index d2acadbe37027519db6dcd62dd37c6d589e145b0..a9472addd392134aa4df37596d9baa1fcec1291d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -71,6 +71,7 @@ PHP                                                                        NEWS
   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).