com php-src: merge test from PHP-5.4: ext/standard/tests/genera l_functions/proc_nice_basic.phpt

Commit: a601605f14ce12977b2d3771fd19421ad2aa2f47 Author: Xinchen Hui <laruence@php.net> Mon, 30 Apr 2012 12:33:55 +0800 Parents: d80a3d966898565f48af6417f38803ba85c0be3e Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a601605f14ce12977b2d3771fd19421ad2aa2f47 Log: merge test from PHP-5.4 Changed paths: M ext/standard/tests/general_functions/proc_nice_basic.phpt Diff: diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt index 3a95890..83b5165 100644 --- 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];