From: Tjerk Anne Meesters <datibbaw@php.net>
Date: Wed, 31 Aug 2011 18:26:23 +0000 (+0000)
Subject: Fixed expect format to ignore the textual error message from readlink().
X-Git-Tag: php-5.3.9RC1~300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=323ee1fe4c0433407a9939e605e8a52d31fd5b53;p=php

Fixed expect format to ignore the textual error message from readlink().

Bug #55555
---

diff --git a/ext/standard/tests/file/readlink_realpath_variation3.phpt b/ext/standard/tests/file/readlink_realpath_variation3.phpt
index 70e8d0c949..3766a5b43a 100644
--- a/ext/standard/tests/file/readlink_realpath_variation3.phpt
+++ b/ext/standard/tests/file/readlink_realpath_variation3.phpt
@@ -46,32 +46,32 @@ echo "Done\n";
 *** Testing readlink() and realpath() with linkname as empty string, NULL and single space ***
 -- Iteration1 --
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 %s
 -- Iteration2 --
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 %s
 -- Iteration3 --
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) "%s"
 -- Iteration4 --
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) "%s"
 -- Iteration5 --
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) "%s"
 -- Iteration6 --
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) "%s"
 Done
diff --git a/ext/standard/tests/file/readlink_variation1.phpt b/ext/standard/tests/file/readlink_variation1.phpt
index 49dc6a540b..1dae17cbd4 100644
--- a/ext/standard/tests/file/readlink_variation1.phpt
+++ b/ext/standard/tests/file/readlink_variation1.phpt
@@ -50,28 +50,28 @@ unlink($file_path."/readlink_variation2.tmp");
 --EXPECTF--
 *** Testing Invalid file types ***
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 
 Warning: readlink() expects parameter 1 to be string, resource given in %s on line %d
 NULL
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 
-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 
 *** Done ***