jani                                     Fri, 27 Nov 2009 23:34:36 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=291363

Log:
- Fixed bug #49935 (Deprecated warnings make "make test" to fail)

Bug: http://bugs.php.net/49935 (Assigned) All tests failing due to warning 
message
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/Makefile.global
    U   php/php-src/branches/PHP_5_3/main/main.c
    _U  php/php-src/branches/PHP_5_3/tests/run-test/
    U   php/php-src/trunk/Makefile.global
    U   php/php-src/trunk/main/main.c

Modified: php/php-src/branches/PHP_5_3/Makefile.global
===================================================================
--- php/php-src/branches/PHP_5_3/Makefile.global        2009-11-27 22:24:44 UTC 
(rev 291362)
+++ php/php-src/branches/PHP_5_3/Makefile.global        2009-11-27 23:34:36 UTC 
(rev 291363)
@@ -79,19 +79,20 @@
                        . $$i; $(top_srcdir)/build/shtool echo -n -- " -d 
$(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
                done; \
        fi`
+PHP_DEPRECATED_DIRECTIVES_REGEX = 
'^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
 ]*='

 test: all
        -...@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; 
then \
                INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo 
php_ini_loaded_file();' 2> /dev/null`; \
                if test "$$INI_FILE"; then \
-                       $(EGREP) -v 
'^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ 
]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
+                       $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) 
"$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
                else \
                        echo > $(top_builddir)/tmp-php.ini; \
                fi; \
                INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' 
-r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> 
/dev/null`; \
                if test "$$INI_SCANNED_PATH"; then \
                        INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d 
$$INI_SCANNED_PATH`; \
-                       $(EGREP) -h -v 
'^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ 
]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+                       $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) 
"$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
                fi; \
                TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
                TEST_PHP_SRCDIR=$(top_srcdir) \

Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c    2009-11-27 22:24:44 UTC (rev 
291362)
+++ php/php-src/branches/PHP_5_3/main/main.c    2009-11-27 23:34:36 UTC (rev 
291363)
@@ -2032,6 +2032,7 @@
        module_initialized = 1;

        /* Check for deprecated directives */
+       /* NOTE: If you add anything here, remember to add it also in 
Makefile.global! */
        {
                static const char *directives[] = {
                        "define_syslog_variables",


Property changes on: php/php-src/branches/PHP_5_3/tests/run-test
___________________________________________________________________
Modified: svn:ignore
   - *.php

   + phpt.*
*.mem
*.diff
*.log
*.exp
*.out
*.php
*.gcda
*.gcno


Modified: php/php-src/trunk/Makefile.global
===================================================================
--- php/php-src/trunk/Makefile.global   2009-11-27 22:24:44 UTC (rev 291362)
+++ php/php-src/trunk/Makefile.global   2009-11-27 23:34:36 UTC (rev 291363)
@@ -79,19 +79,20 @@
                        . $$i; $(top_srcdir)/build/shtool echo -n -- " -d 
$(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
                done; \
        fi`
+PHP_DEPRECATED_DIRECTIVES_REGEX = 
'^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
 ]*='

 test: all
        -...@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; 
then \
                INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo 
php_ini_loaded_file();' 2> /dev/null`; \
                if test "$$INI_FILE"; then \
-                       $(EGREP) -v 
'^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ 
]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
+                       $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) 
"$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
                else \
                        echo > $(top_builddir)/tmp-php.ini; \
                fi; \
                INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' 
-r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> 
/dev/null`; \
                if test "$$INI_SCANNED_PATH"; then \
                        INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d 
$$INI_SCANNED_PATH`; \
-                       $(EGREP) -h -v 
'^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ 
]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+                       $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) 
"$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
                fi; \
                TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
                TEST_PHP_SRCDIR=$(top_srcdir) \

Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c       2009-11-27 22:24:44 UTC (rev 291362)
+++ php/php-src/trunk/main/main.c       2009-11-27 23:34:36 UTC (rev 291363)
@@ -2056,6 +2056,7 @@
        }

        /* Check for removed directives */
+       /* NOTE: If you add anything here, remember to add it also in 
Makefile.global! */
        {
                static const char *directives[] = {
                        "define_syslog_variables",

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to