pajoye                                   Tue, 06 Sep 2011 07:44:43 +0000

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

Log:
- fix test

Changed paths:
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt
    U   php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt	2011-09-06 07:32:37 UTC (rev 316227)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt	2011-09-06 07:44:43 UTC (rev 316228)
@@ -71,73 +71,74 @@
 -- 0 testing '-1' integer --
 bool(true)

-Warning: rename(-1,%s/renameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %s on line %d
+Warning: rename(-1,%safile.tmp): The system cannot find the file specified. (code: 2) in %srename_variation13-win32.php on line 50
 bool(false)
 -- 1 testing '1' boolean --
 bool(true)

-Warning: rename(1,%s/renameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %s on line %d
+Warning: rename(1,%safile.tmp): The system cannot find the file specified. (code: 2) in %srename_variation13-win32.php on line 50
 bool(false)
 -- 2 testing '' boolean --

-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
+Warning: rename(%safile.tmp,): Invalid argument in %srename_variation13-win32.php on line 42
 bool(false)

-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
+Warning: rename(,%safile.tmp): Invalid argument in %srename_variation13-win32.php on line 50
 bool(false)
 -- 3 testing '' NULL --

-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
+Warning: rename(%safile.tmp,): Invalid argument in %srename_variation13-win32.php on line 42
 bool(false)

-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
+Warning: rename(,%safile.tmp): Invalid argument in %srename_variation13-win32.php on line 50
 bool(false)
 -- 4 testing '' string --

-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
+Warning: rename(%safile.tmp,): Invalid argument in %srename_variation13-win32.php on line 42
 bool(false)

-Warning: rename(,%s/renameVar13/afile.tmp):%s in %s on line %d
+Warning: rename(,%safile.tmp): Invalid argument in %srename_variation13-win32.php on line 50
 bool(false)
 -- 5 testing ' ' string --

-Warning: rename(%s/renameVar13/afile.tmp, ): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename() expects parameter 2 to be a valid path, string given in %srename_variation13-win32.php on line 42
 bool(false)

-Warning: rename( ,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line 43
+
+Warning: rename() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line 50
 bool(false)
 -- 6 testing '' string --

-Warning: rename() expects parameter 2 to be a valid path, string given in %s on line %d
+Warning: rename() expects parameter 2 to be a valid path, string given in %srename_variation13-win32.php on line 42
 bool(false)

-Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line 43

-Warning: rename() expects parameter 1 to be a valid path, string given in %s on line %d
+Warning: rename() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line 50
 bool(false)
 -- 7 testing 'Array' array --

-Warning: rename() expects parameter 2 to be a valid path, array given in %s on line %d
+Warning: rename() expects parameter 2 to be a valid path, array given in %srename_variation13-win32.php on line 42
 bool(false)

-Warning: file_exists() expects parameter 1 to be a valid path, array given in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, array given in %srename_variation13-win32.php on line 43

-Warning: rename() expects parameter 1 to be a valid path, array given in %s on line %d
+Warning: rename() expects parameter 1 to be a valid path, array given in %srename_variation13-win32.php on line 50
 bool(false)
 -- 8 testing '/no/such/file/dir' string --

-Warning: rename(%s/renameVar13/afile.tmp,/no/such/file/dir): The system cannot find the path specified. (code: 3) in %s on line %d
+Warning: rename(%safile.tmp,/no/such/file/dir): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line 42
 bool(false)

-Warning: rename(/no/such/file/dir,%s/renameVar13/afile.tmp): The system cannot find the path specified. (code: 3) in %s on line %d
+Warning: rename(/no/such/file/dir,%safile.tmp): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line 50
 bool(false)
 -- 9 testing 'php/php' string --

-Warning: rename(%s/renameVar13/afile.tmp,php/php): The system cannot find the path specified. (code: 3) in %s on line %d
+Warning: rename(%safile.tmp,php/php): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line 42
 bool(false)

-Warning: rename(php/php,%s/renameVar13/afile.tmp): The system cannot find the path specified. (code: 3) in %s on line %d
+Warning: rename(php/php,%safile.tmp): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line 50
 bool(false)

 *** Done ***
-

Modified: php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt	2011-09-06 07:32:37 UTC (rev 316227)
+++ php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt	2011-09-06 07:44:43 UTC (rev 316228)
@@ -71,71 +71,73 @@
 -- 0 testing '-1' integer --
 bool(true)

-Warning: rename(-1,%s/renameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %s on line %d
+Warning: rename(-1,%srenameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %srename_variation13-win32.php on line %d
 bool(false)
 -- 1 testing '1' boolean --
 bool(true)

-Warning: rename(1,%s/renameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %s on line %d
+Warning: rename(1,%srenameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %srename_variation13-win32.php on line %d
 bool(false)
 -- 2 testing '' boolean --

-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
+Warning: rename(%srenameVar13/afile.tmp,): Invalid argument in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
+Warning: rename(,%srenameVar13/afile.tmp): Invalid argument in %srename_variation13-win32.php on line %d
 bool(false)
 -- 3 testing '' NULL --

-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
+Warning: rename(%srenameVar13/afile.tmp,): Invalid argument in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
+Warning: rename(,%srenameVar13/afile.tmp): Invalid argument in %srename_variation13-win32.php on line %d
 bool(false)
 -- 4 testing '' string --

-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
+Warning: rename(%srenameVar13/afile.tmp,): Invalid argument in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: rename(,%s/renameVar13/afile.tmp):%s in %s on line %d
+Warning: rename(,%srenameVar13/afile.tmp): Invalid argument in %srename_variation13-win32.php on line %d
 bool(false)
 -- 5 testing ' ' string --

-Warning: rename(%s/renameVar13/afile.tmp, ): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename() expects parameter 2 to be a valid path, string given in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: rename( ,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line %d
+
+Warning: rename() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line %d
 bool(false)
--- 6 testing '
-Warning: rename() expects parameter 2 to be a valid path, string given in %s on line %d
+-- 6 testing '' string --
+Warning: rename() expects parameter 2 to be a valid path, string given in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line %d

-Warning: rename() expects parameter 1 to be a valid path, string given in %s on line %d
+Warning: rename() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line %d
 bool(false)
 -- 7 testing 'Array' array --

-Warning: rename() expects parameter 2 to be a valid path, array given in %s on line %d
+Warning: rename() expects parameter 2 to be a valid path, array given in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: file_exists() expects parameter 1 to be a valid path, array given in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, array given in %srename_variation13-win32.php on line %d

-Warning: rename() expects parameter 1 to be a valid path, array given in %s on line %d
+Warning: rename() expects parameter 1 to be a valid path, array given in %srename_variation13-win32.php on line %d
 bool(false)
 -- 8 testing '/no/such/file/dir' string --

-Warning: rename(%s/renameVar13/afile.tmp,/no/such/file/dir): The system cannot find the path specified. (code: 3) in %s on line %d
+Warning: rename(%srenameVar13/afile.tmp,/no/such/file/dir): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: rename(/no/such/file/dir,%s/renameVar13/afile.tmp): The system cannot find the path specified. (code: 3) in %s on line %d
+Warning: rename(/no/such/file/dir,%srenameVar13/afile.tmp): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line %d
 bool(false)
 -- 9 testing 'php/php' string --

-Warning: rename(%s/renameVar13/afile.tmp,php/php): The system cannot find the path specified. (code: 3) in %s on line %d
+Warning: rename(%srenameVar13/afile.tmp,php/php): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: rename(php/php,%s/renameVar13/afile.tmp): The system cannot find the path specified. (code: 3) in %s on line %d
+Warning: rename(php/php,%srenameVar13/afile.tmp): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php 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