com php-src: Fix bug #70781 (Extension tests fail on dynamic ext dependency): run-tests.php
| From: | Anatol Belski | Date: | Wed, 09 Dec 2015 10:05:34 +0000 |
| Subject: | com php-src: Fix bug #70781 (Extension tests fail on dynamic ext dependency): run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90164@lists.php.net to get a copy of this message | ||
Commit: 25abf2f028171fd89627824ef2c98090a2802361
Author: Francois Laupretre <francois@php.net> Sat, 24 Oct 2015 19:51:28 +0200
Committer: Anatol Belski <ab@php.net> Wed, 9 Dec 2015 11:05:34 +0100
Parents: f248309b7485fea08e3c112adab97bfa1fc74df4
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=25abf2f028171fd89627824ef2c98090a2802361
Log:
Fix bug #70781 (Extension tests fail on dynamic ext dependency)
Bugs:
https://bugs.php.net/70781
Changed paths:
M run-tests.php
Diff:
diff --git a/run-tests.php b/run-tests.php
index a607f1c..bc9de7f 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.