Make it possible to test language features like newly introduced 'abstract'

independantly from debug mode.

diff --git a/main/main.c b/main/main.c
index 7cfc9462f0c8e4c654efe736810e118ddd696e13..e0bc8798a88d0e9a5f2756eda3f27c5ca31589af 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -246,6 +246,7 @@ PHP_INI_BEGIN()
        STD_PHP_INI_BOOLEAN("ignore_repeated_errors",   "0",    PHP_INI_ALL,            OnUpdateBool,                   ignore_repeated_errors, php_core_globals,       core_globals)
        STD_PHP_INI_BOOLEAN("ignore_repeated_source",   "0",    PHP_INI_ALL,            OnUpdateBool,                   ignore_repeated_source, php_core_globals,       core_globals)
        STD_PHP_INI_BOOLEAN("report_memleaks",          "1",            PHP_INI_ALL,            OnUpdateBool,                   report_memleaks,                php_core_globals,       core_globals)
+       STD_PHP_INI_BOOLEAN("report_zend_debug",        "1",            PHP_INI_ALL,            OnUpdateBool,                   report_zend_debug,              php_core_globals,       core_globals)
        STD_PHP_INI_BOOLEAN("magic_quotes_gpc",         "1",            PHP_INI_PERDIR|PHP_INI_SYSTEM,  OnUpdateBool,   magic_quotes_gpc,               php_core_globals,       core_globals)
        STD_PHP_INI_BOOLEAN("magic_quotes_runtime",     "0",            PHP_INI_ALL,            OnUpdateBool,                   magic_quotes_runtime,   php_core_globals,       core_globals)
        STD_PHP_INI_BOOLEAN("magic_quotes_sybase",      "0",            PHP_INI_ALL,            OnUpdateBool,                   magic_quotes_sybase,    php_core_globals,       core_globals)
@@ -615,7 +616,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
                        }
                }
 #if ZEND_DEBUG
-               {
+               if (PG(report_zend_debug)) {
                        zend_bool trigger_break;
 
                        switch (type) {

diff --git a/main/php_globals.h b/main/php_globals.h
index bc34330a92b114d20aed8687b85eb37041533e20..c8890aadbfafe0866b18463843231e9ef59495c1 100644 (file)
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -140,6 +140,7 @@ struct _php_core_globals {
 
        zend_bool always_populate_raw_post_data;
        
+       zend_bool report_zend_debug;
 };
 
 

diff --git a/run-tests.php b/run-tests.php
index c1fd98eb4d429ae6b5740d54f907da1a0888000c..068051466ee1a0c58fdfb6caed39b070134d955a 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -123,10 +123,11 @@ $ini_overwrites = array(
                'html_errors=0',
                'track_errors=1',
                'report_memleaks=1',
-               "docref_root=/phpmanual/",
-               "docref_ext=.html",
-               "error_prepend_string=",
-               "error_append_string=",
+               'report_zend_debug=0',
+               'docref_root=/phpmanual/',
+               'docref_ext=.html',
+               'error_prepend_string=',
+               'error_append_string=',
                'auto_prepend_file=',
                'auto_append_file=',
                'magic_quotes_runtime=0',