datibbaw                                 Wed, 31 Aug 2011 18:26:23 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315912

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

Bug #55555

Bug: https://bugs.php.net/55555 (Assigned) readlink() behaviour changed
      
Changed paths:
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_realpath_variation3.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_variation1.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_realpath_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_variation1.phpt
    U   
php/php-src/trunk/ext/standard/tests/file/readlink_realpath_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/readlink_variation1.phpt

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_realpath_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:18:23 UTC (rev 315911)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:26:23 UTC (rev 315912)
@@ -46,32 +46,32 @@
 *** 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

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_variation1.phpt	2011-08-31 18:18:23 UTC (rev 315911)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_variation1.phpt	2011-08-31 18:26:23 UTC (rev 315912)
@@ -50,28 +50,28 @@
 --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 ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_realpath_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:18:23 UTC (rev 315911)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:26:23 UTC (rev 315912)
@@ -46,32 +46,32 @@
 *** 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

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_variation1.phpt	2011-08-31 18:18:23 UTC (rev 315911)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_variation1.phpt	2011-08-31 18:26:23 UTC (rev 315912)
@@ -50,28 +50,28 @@
 --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 ***

Modified: php/php-src/trunk/ext/standard/tests/file/readlink_realpath_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:18:23 UTC (rev 315911)
+++ php/php-src/trunk/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:26:23 UTC (rev 315912)
@@ -46,32 +46,32 @@
 *** 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

Modified: php/php-src/trunk/ext/standard/tests/file/readlink_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/readlink_variation1.phpt	2011-08-31 18:18:23 UTC (rev 315911)
+++ php/php-src/trunk/ext/standard/tests/file/readlink_variation1.phpt	2011-08-31 18:26:23 UTC (rev 315912)
@@ -50,28 +50,28 @@
 --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 ***
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to