Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make it possible to test language features like newly introduced 'abs…

…tract'

independantly from debug mode.
  • Loading branch information...
commit b7cd48efddacffe4fd864b0a1692d465719dd1bd 1 parent da0e29e
Marcus Boerger authored
Showing with 8 additions and 5 deletions.
  1. +2 −1  main/main.c
  2. +1 −0  main/php_globals.h
  3. +5 −4 run-tests.php
3  main/main.c
View
@@ -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) {
1  main/php_globals.h
View
@@ -140,6 +140,7 @@ struct _php_core_globals {
zend_bool always_populate_raw_post_data;
+ zend_bool report_zend_debug;
};
9 run-tests.php
View
@@ -123,10 +123,11 @@
'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',
Please sign in to comment.
Something went wrong with that request. Please try again.