merge test from PHP-5.4

php · Apr 30, 2012 · a601605 · a601605
1 parent d80a3d9
commit a601605
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt
@@ -13,7 +13,7 @@ if(!function_exists('proc_nice')) die("skip. proc_nice not available ");
 <?php
 	function getNice($id)
 	{
-		$res = shell_exec('ps -p ' . $id .' -o "%p %n"');
+		$res = shell_exec('ps -p ' . $id .' -o "pid,nice"');
 		preg_match('/^\s*\w+\s+\w+\s*(\d+)\s+(\d+)/m', $res, $matches);
 		if (count($matches) > 2)
 			return $matches[2];