Fix bug #70781 (Extension tests fail on dynamic ext dependency)

laumin · Dec 9, 2015 · 25abf2f · 25abf2f
1 parent f248309
commit 25abf2f
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/run-tests.php b/run-tests.php
@@ -1539,18 +1539,6 @@ function run_test($php, $file, $env)
 
 	// 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 @@ function run_test($php, $file, $env)
 		}
 	}
 
+	// 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.