diff options
| author | Xinchen Hui <laruence@php.net> | 2012-04-30 12:29:15 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-04-30 12:29:15 +0800 |
| commit | 24d85e4bd8d56197ca673791ad007f2e595478cf (patch) | |
| tree | 8e1d50c10b146d222e089d0b0d7aa15e567d9b3b | |
| parent | bae56a87f81b91cd815604b0f404f616b0d73c2b (diff) | |
| parent | e52be10b30d3efd07ba705801b28ee5173b6fe2c (diff) | |
| download | php-git-24d85e4bd8d56197ca673791ad007f2e595478cf.tar.gz | |
Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3
| -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..b64eab1309 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 -o ni'); preg_match('/^\s*\w+\s+\w+\s*(\d+)\s+(\d+)/m', $res, $matches); if (count($matches) > 2) return $matches[2]; |