Skip to content
Permalink
Browse files

Merge branch 'xdebug_2_8'

  • Loading branch information...
derickr committed Aug 12, 2019
2 parents 77543ca + 8d9d444 commit 913e3093b51965bc1fd583359ad4a1325365edad
Showing with 5 additions and 1 deletion.
  1. +5 −1 run-xdebug-tests.php
@@ -1623,7 +1623,11 @@ function run_test($php, $file, $env)
junit_start_timer($shortname);
$output = system_with_timeout("$extra $php $pass_options $extra_options -q $ini_settings $no_file_cache -d display_errors=0 \"$test_skipif\"", $env);
/* Remove auto prepend and append settings for SKIPIF */
$skipif_ini_settings = $ini_settings;
$skipif_ini_settings = preg_replace( '@-d \"auto_prepend_file=.*?\" @', '', $skipif_ini_settings );
$skipif_ini_settings = preg_replace( '@-d \"auto_append_file=.*?\" @', '', $skipif_ini_settings );
$output = system_with_timeout("$extra $php $pass_options $extra_options -q $skipif_ini_settings $no_file_cache -d display_errors=0 \"$test_skipif\"", $env);
junit_finish_timer($shortname);

0 comments on commit 913e309

Please sign in to comment.
You can’t perform that action at this time.