From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 11 Nov 2011 02:05:54 +0000 (+0000)
Subject: Suppress lsof warnings here to avoid FUSE-related
X-Git-Tag: php-5.4.0RC2~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b27d604b28cd2e4f187ba9227e7e67d399411d33;p=php

Suppress lsof warnings here to avoid FUSE-related
warnings in certain environments. This doesn't
affect what is being tested.
---

diff --git a/ext/mysql/tests/bug55473.phpt b/ext/mysql/tests/bug55473.phpt
index df584bdef9..3fdd2cc5df 100644
--- a/ext/mysql/tests/bug55473.phpt
+++ b/ext/mysql/tests/bug55473.phpt
@@ -8,7 +8,7 @@ if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
 	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 @@ mysql.allow_persistent=1
 
 
 		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 @@ mysql.allow_persistent=1
 [007] Opened files as expected
 [003] reconnect 3
 [007] Opened files as expected
-done!
\ No newline at end of file
+done!