Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix bug #70781 (Extension tests fail on dynamic ext dependency)

1 files changed, 13 insertions, 12 deletions

diff --git a/run-tests.php b/run-tests.php
index be3d3d46f3..9301e8ac4d 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1501,18 +1501,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)) {
@@ -1526,6 +1514,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.