- Allow to specify ini to use for test executeable

1 files changed, 10 insertions, 0 deletions

diff --git a/run-tests.php b/run-tests.php
index ffc63f0446..1c12c8cde1 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -237,6 +237,7 @@ $html_file = null;
 $temp_source = null;
 $temp_target = null;
 $temp_urlbase = null;
+$conf_passed = null;
 
 $cfgtypes = array('show', 'keep');
 $cfgfiles = array('skip', 'php');
@@ -294,6 +295,9 @@ if (isset($argc) && $argc > 1) {
 				case 'a':
 					$failed_tests_file = fopen($argv[++$i], 'a+t');
 					break;
+				case 'c':
+					$conf_passed = $argv[++$i];
+					break;
 				case 'd':
 					$ini_overwrites[] = $argv[++$i];
 					break;
@@ -394,6 +398,8 @@ Options:
 
     -a <file>   Same as -w but append rather then truncating <file>.
 
+    -c <file>   Look for php.ini in directory <file> or use <file> as ini.
+
     -n          Pass -n option to the php binary (Do not use a php.ini).
 
     -d foo=bar  Pass -d option to the php binary (Define INI entry foo
@@ -442,6 +448,10 @@ HELP;
 			}
 		}
 	}
+	if (strlen($conf_passed))
+	{
+		$pass_options .= " -c '$conf_passed'";
+	}
 	$test_files = array_unique($test_files);
 	$test_files = array_merge($test_files, $redir_tests);