diff options
| author | Francois Laupretre <francois@php.net> | 2015-10-24 19:51:28 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-12-09 11:05:34 +0100 |
| commit | 25abf2f028171fd89627824ef2c98090a2802361 (patch) | |
| tree | d737bac6ae314f2c37047fbe19df591716cfb520 /run-tests.php | |
| parent | f248309b7485fea08e3c112adab97bfa1fc74df4 (diff) | |
| download | php-git-25abf2f028171fd89627824ef2c98090a2802361.tar.gz | |
Fix bug #70781 (Extension tests fail on dynamic ext dependency)
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/run-tests.php b/run-tests.php index a607f1cda2..bc9de7fdcf 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1539,18 +1539,6 @@ TEST $file // Default ini settings $ini_settings = array(); - // additional ini overwrites - //$ini_overwrites[] = 'setting=value'; - settings2array($ini_overwrites, $ini_settings); - - // Any special ini settings - // these may overwrite the test defaults... - if (array_key_exists('INI', $section_text)) { - if (strpos($section_text['INI'], '{PWD}') !== false) { - $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']); - } - settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings); - } // Additional required extensions if (array_key_exists('EXTENSIONS', $section_text)) { @@ -1564,6 +1552,19 @@ TEST $file } } + // additional ini overwrites + //$ini_overwrites[] = 'setting=value'; + settings2array($ini_overwrites, $ini_settings); + + // Any special ini settings + // these may overwrite the test defaults... + if (array_key_exists('INI', $section_text)) { + if (strpos($section_text['INI'], '{PWD}') !== false) { + $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']); + } + settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings); + } + settings2params($ini_settings); // Check if test should be skipped. |