php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3"

Browse Source 
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 24d85e4bd8, reversing
changes made to bae56a87f8.
This commit is contained in:
Xinchen Hui
2012-04-30 12:31:33 +08:00
parent 24d85e4bd8
commit d80a3d9668
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/tests/general_functions/proc_nice_basic.phpt
+1 -1
View File
@@ -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];