diff options
| author | Xinchen Hui <laruence@php.net> | 2012-04-30 12:31:33 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-04-30 12:31:33 +0800 |
| commit | d80a3d966898565f48af6417f38803ba85c0be3e (patch) | |
| tree | 4df775d20a8054e2ed0f2818aa1fe1b9b8a4cc46 | |
| parent | 24d85e4bd8d56197ca673791ad007f2e595478cf (diff) | |
| download | php-git-d80a3d966898565f48af6417f38803ba85c0be3e.tar.gz | |
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.
| -rw-r--r-- | ext/standard/tests/general_functions/proc_nice_basic.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt index b64eab1309..3a958901a2 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]; |