[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] cvs: php-src(PHP_5_1) / run-tests.php
From:       "Marcus Boerger" <helly () php ! net>
Date:       2005-12-30 13:39:54
Message-ID: cvshelly1135949994 () cvsserver
[Download RAW message or body]

helly		Fri Dec 30 13:39:54 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src	run-tests.php 
  Log:
  - Allow to specify ini to use for test executeable
  
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.21&r2=1.226.2.22&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.21 php-src/run-tests.php:1.226.2.22
--- php-src/run-tests.php:1.226.2.21	Fri Dec 30 13:31:48 2005
+++ php-src/run-tests.php	Fri Dec 30 13:39:54 2005
@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: run-tests.php,v 1.226.2.21 2005/12/30 13:31:48 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.22 2005/12/30 13:39:54 helly Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is available.
  * In the event it is not, print a nice error message indicating that this script will
@@ -237,6 +237,7 @@
 $temp_source = null;
 $temp_target = null;
 $temp_urlbase = null;
+$conf_passed = null;
 
 $cfgtypes = array('show', 'keep');
 $cfgfiles = array('skip', 'php');
@@ -294,6 +295,9 @@
 				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;
@@ -367,7 +371,7 @@
 					$html_output = is_resource($html_file);
 					break;
 				case '--version':
-					echo '$Revision: 1.226.2.21 $'."\n";
+					echo '$Revision: 1.226.2.22 $'."\n";
 					exit(1);
 				default:
 					echo "Illegal switch '$switch' specified!\n";
@@ -394,6 +398,8 @@
 
     -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 @@
 			}
 		}
 	}
+	if (strlen($conf_passed))
+	{
+		$pass_options .= " -c '$conf_passed'";
+	}
 	$test_files = array_unique($test_files);
 	$test_files = array_merge($test_files, $redir_tests);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]