diff options
| author | Xinchen Hui <laruence@php.net> | 2012-04-30 12:33:55 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-04-30 12:33:55 +0800 |
| commit | a601605f14ce12977b2d3771fd19421ad2aa2f47 (patch) | |
| tree | 979604f5474a6d066b36566e31209bef18168d85 | |
| parent | d80a3d966898565f48af6417f38803ba85c0be3e (diff) | |
| download | php-git-a601605f14ce12977b2d3771fd19421ad2aa2f47.tar.gz | |
merge test from PHP-5.4
| -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 3a958901a2..83b5165679 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]; |