com php-src: Revert "Merge branch 'fix-pro_nice-test' o f https://github.com/reeze/php-src into PHP-5.3 ":
ext/standard/tests/general_functions/proc_nice_b asic.phpt

Commit: d80a3d966898565f48af6417f38803ba85c0be3e Author: Xinchen Hui <laruence@php.net> Mon, 30 Apr 2012 12:31:33 +0800 Parents: 24d85e4bd8d56197ca673791ad007f2e595478cf Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d80a3d966898565f48af6417f38803ba85c0be3e Log: Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3" After pushed, I found the test script in 5.4 is already fixed this, so revert this change, and be consistent with 5.4's test This reverts commit 24d85e4bd8d56197ca673791ad007f2e595478cf, reversing changes made to bae56a87f81b91cd815604b0f404f616b0d73c2b. 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 b64eab1..3a95890 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 pid -o ni'); + $res = shell_exec('ps -p ' . $id .' -o "%p %n"'); preg_match('/^\s*\w+\s+\w+\s*(\d+)\s+(\d+)/m', $res, $matches); if (count($matches) > 2) return $matches[2];