Patch run-tests--skip-post-clean-with-spaces for *General Issues Bug #60734

Patch version 2012-01-12 21:50 UTC

• 2012-01-12 21:50 UTC [diff to current]

Developer: danielc@analysisandsolutions.com

Index: run-tests.php
===================================================================
--- run-tests.php	(revision 320511)
+++ run-tests.php	(working copy)
@@ -1518,7 +1518,7 @@
 			if ($JUNIT) {
 				$test_started_at	= microtime(true);
 			}
-			$output = system_with_timeout("$extra $php $pass_options -q $ini_settings -d display_errors=0 $test_skipif", $env);
+			$output = system_with_timeout("$extra $php $pass_options -q $ini_settings -d display_errors=0 \"$test_skipif\"", $env);
 			if ($JUNIT) {
 				$test_finished_at   = microtime(true);
 				$test_execution_time= number_format($test_finished_at-$test_started_at, 2);
@@ -1713,7 +1713,7 @@
 		}
 
 		save_text($tmp_post, $request);
-		$cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
+		$cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1 < \"$tmp_post\"";
 
 	} else if (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) {
 
@@ -1734,7 +1734,7 @@
 		$env['CONTENT_TYPE']   = 'application/x-www-form-urlencoded';
 		$env['CONTENT_LENGTH'] = $content_length;
 
-		$cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
+		$cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1 < \"$tmp_post\"";
 
 	} else {
 
@@ -1792,7 +1792,7 @@
 				settings2params($clean_params);
 				$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
 					"unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": "";
-				system_with_timeout("$extra $php $pass_options -q $clean_params $test_clean", $env);
+				system_with_timeout("$extra $php $pass_options -q $clean_params \"$test_clean\"", $env);
 			}
 
 			if (!$cfg['keep']['clean']) {