Patch dir.diff for Testing related Bug #60506

Patch version 2011-12-13 00:57 UTC

• 2011-12-13 00:57 UTC [diff to current]

Developer: mattficken

Index: dir_variation8-win32.phpt
===================================================================
--- dir_variation8-win32.phpt	(revision 320815)
+++ dir_variation8-win32.phpt	(working copy)
@@ -45,23 +45,23 @@
 *** Testing dir() : checking with wildcard characters ***
 -- wildcard = '*' --
 
-Warning: dir(%s/dir_var*,%s/dir_var*): No such file or directory in %s on line %d
+Warning: dir(%sdir_var*): The system cannot find the path specified. (code: 3) in %sdir_variation8-win32.php on line %d
 
 Warning: dir(%s/dir_var*): failed to open dir: %s in %s on line %d
 bool(false)
 
-Warning: dir(%s/*,%s/*): No such file or directory in %s on line %d
+Warning: dir(%s/*,%s/*): The system cannot find the path specified. (code: 3) in %sdir_variation8-win32.php on line %d
 
 Warning: dir(%s/*): failed to open dir: %s in %s on line %d
 bool(false)
 -- wildcard = '?' --
 
-Warning: dir(%s/dir_variation81/sub_dir?,%s/dir_variation81/sub_dir?): No such file or directory in %s on line %d
+Warning: dir(%s/dir_variation81/sub_dir?,%s/dir_variation81/sub_dir?): The system cannot find the path specified. (code: 3) in %sdir_variation8-win32.php on line %d
 
 Warning: dir(%s/dir_variation81/sub_dir?): failed to open dir: %s in %s on line %d
 bool(false)
 
-Warning: dir(%s/dir_variation81/sub?dir1,%s/dir_variation81/sub?dir1): No such file or directory in %s on line %d
+Warning: dir(%s/dir_variation81/sub?dir1,%s/dir_variation81/sub?dir1): The system cannot find the path specified. (code: 3) in %sdir_variation8-win32.php on line %d
 
 Warning: dir(%s/dir_variation81/sub?dir1): failed to open dir: %s in %s on line %d
 bool(false)
Index: scandir_variation6-win32.phpt
===================================================================
--- scandir_variation6-win32.phpt	(revision 320815)
+++ scandir_variation6-win32.phpt	(working copy)
@@ -54,8 +54,15 @@
 
 Warning: scandir(%s/scandir_var*,%s/scandir_var*): No such file or directory in %s on line %d
 
+Warning: scandir(%s\ext\standard\tests\dir/scandir_var*,%s\ext\standard\tests\dir/scandir_var*): No error in %s\ext\standard\tests\dir\scandir_variation6-win32.php on line 24
+Warning: scandir(%s\ext\standard\tests\dir/scandir_var*): failed to open dir: No error in %s\ext\standard\tests\dir\scandir_variation6-win32.php on line 24
+
 Warning: scandir(%s/scandir_var*): failed to open dir: No such file or directory in %sscandir_variation6-win32.php on line %d
 
+Warning: scandir(%s\ext\standard\tests\dir/*,%s\ext\standard\tests\dir/*): No error in %s\ext\standard\tests\dir\scandir_variation6-win32.php on line 25
+
+Warning: scandir(%s\ext\standard\tests\dir/*): failed to open dir: No error in %s\ext\standard\tests\dir\scandir_variation6-win32.php on line 25
+
 Warning: scandir(): (errno %d): %s in %s on line %d
 bool(false)
 
@@ -70,6 +77,10 @@
 
 Warning: scandir(%s/scandir_variation6/sub_dir?,%s/scandir_variation6/sub_dir?): No such file or directory in %s on line %d
 
+Warning: scandir(%s\ext\standard\tests\dir/scandir_variation6/sub_dir?,%s\ext\standard\tests\dir/scandir_variation6/sub_dir?): No error in %s\ext\standard\tests\dir\scandir_variation6-win32.php on line 28
+
+Warning: scandir(%s\ext\standard\tests\dir/scandir_variation6/sub_dir?): failed to open dir: No error in %s\ext\standard\tests\dir\scandir_variation6-win32.php on line 28
+
 Warning: scandir(%s/scandir_variation6/sub_dir?): failed to open dir: No such file or directory in %sscandir_variation6-win32.php on line %d
 
 Warning: scandir(): (errno %d): %s in %s on line %d
@@ -77,6 +88,10 @@
 
 Warning: scandir(%s/scandir_variation6/sub?dir1,%s/scandir_variation6/sub?dir1): No such file or directory in %s on line %d
 
+Warning: scandir(%s\ext\standard\tests\dir/scandir_variation6/sub?dir1,%s\ext\standard\tests\dir/scandir_variation6/sub?dir1): No error in %s\ext\standard\tests\dir\scandir_variation6-win32.php on line 29
+
+Warning: scandir(%s\ext\standard\tests\dir/scandir_variation6/sub?dir1): failed to open dir: No error in %s\ext\standard\tests\dir\scandir_variation6-win32.php on line 29
+
 Warning: scandir(%s/scandir_variation6/sub?dir1): failed to open dir: No such file or directory in %sscandir_variation6-win32.php on line %d
 
 Warning: scandir(): (errno %d): %s in %s on line %d