diff options
| author | Marcus Boerger <helly@php.net> | 2002-11-21 14:56:06 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2002-11-21 14:56:06 +0000 |
| commit | b7cd48efddacffe4fd864b0a1692d465719dd1bd (patch) | |
| tree | afd9755f88f4ed21d7e30c1f2cdaed8f0b4ccfe9 | |
| parent | da0e29e92f06dbd79783b81e9d7bcb903a739d81 (diff) | |
| download | php-git-b7cd48efddacffe4fd864b0a1692d465719dd1bd.tar.gz | |
Make it possible to test language features like newly introduced 'abstract'
independantly from debug mode.
| -rw-r--r-- | main/main.c | 3 | ||||
| -rw-r--r-- | main/php_globals.h | 1 | ||||
| -rwxr-xr-x | run-tests.php | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/main/main.c b/main/main.c index 7cfc9462f0..e0bc8798a8 100644 --- 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 bc34330a92..c8890aadbf 100644 --- 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 c1fd98eb4d..068051466e 100755 --- 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', |