rasmus Fri, 11 Nov 2011 02:05:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319024
Log:
Suppress lsof warnings here to avoid FUSE-related
warnings in certain environments. This doesn't
affect what is being tested.
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mysql/tests/bug55473.phpt
Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/bug55473.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysql/tests/bug55473.phpt 2011-11-11
01:57:11 UTC (rev 319023)
+++ php/php-src/branches/PHP_5_4/ext/mysql/tests/bug55473.phpt 2011-11-11
02:05:54 UTC (rev 319024)
@@ -8,7 +8,7 @@
die("skip Test doesn't work on Windows");
}
-if (!($output = @exec("lsof -np " . getmypid())))
+if (!($output = @exec("lsof -nwp " . getmypid())))
die("skip Test can't find command line tool lsof");
?>
--INI--
@@ -56,9 +56,9 @@
if ($opened_files == -1) {
- $opened_files = trim(exec("lsof -np " . getmypid() . "
| wc -l"));
+ $opened_files = trim(exec("lsof -nwp " . getmypid() . "
| wc -l"));
printf("[005] Setting openened files...\n");
- } else if (($tmp = trim(exec("lsof -np " . getmypid() . " | wc
-l"))) != $opened_files) {
+ } else if (($tmp = trim(exec("lsof -nwp " . getmypid() . " | wc
-l"))) != $opened_files) {
printf("[006] [%d] different number of opened_files :
expected %d, got %d", $i, $opened_files, $tmp);
} else {
printf("[007] Opened files as expected\n");
@@ -76,4 +76,4 @@
[007] Opened files as expected
[003] reconnect 3
[007] Opened files as expected
-done!
\ No newline at end of file
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
