- Modified expected output to allow tests to work on all platforms

diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt
index b99fe41d4e9eb79219dd91107a3c90c87db89373..72163602c57aa5bfcfe849797e76ea3db2005c0a 100644 (file)
--- a/ext/standard/tests/dir/dir_variation7.phpt
+++ b/ext/standard/tests/dir/dir_variation7.phpt
@@ -85,21 +85,21 @@ rmdir($parent_dir_path);
 *** Testing dir() : remove execute permission from the parent dir ***
 -- After restricting 1st level parent directory --
 
-Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d
+Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d
 bool(false)
 -- After restricting parent directory --
 
-Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d
+Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d
 bool(false)
 Done
 --UEXPECTF--
 *** Testing dir() : remove execute permission from the parent dir ***
 -- After restricting 1st level parent directory --
 
-Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d
+Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d
 bool(false)
 -- After restricting parent directory --
 
-Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d
+Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d
 bool(false)
 Done

diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt
index 9f23ef4cc094d766c3d0b6e1b3977f29c21337fb..9f37a072edaca930502c2a2cce963b625615d0de 100644 (file)
--- a/ext/standard/tests/dir/opendir_error2.phpt
+++ b/ext/standard/tests/dir/opendir_error2.phpt
@@ -27,12 +27,12 @@ var_dump(opendir('idonotexist'));
 
 -- Pass a non-existent absolute path: --
 
-Warning: opendir(%s/idonotexist): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/idonotexist): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Pass a non-existent relative path: --
 
-Warning: opendir(idonotexist): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(idonotexist): failed to open dir: %s in %s on line %d
 bool(false)
 ===DONE===
 --UEXPECTF--
@@ -40,11 +40,11 @@ bool(false)
 
 -- Pass a non-existent absolute path: --
 
-Warning: opendir(%s/idonotexist): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/idonotexist): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Pass a non-existent relative path: --
 
-Warning: opendir(idonotexist): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(idonotexist): failed to open dir: %s in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/standard/tests/dir/opendir_variation1.phpt b/ext/standard/tests/dir/opendir_variation1.phpt
index a2124765bceaec69deed7abf1a51b4b02a77bb53..6b9e7b22844107a1eae46fa6ec78db81f93c6d52 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation1.phpt
+++ b/ext/standard/tests/dir/opendir_variation1.phpt
@@ -115,47 +115,47 @@ rmdir($path);
 
 -- Iteration 1 --
 
-Warning: opendir(0): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(0): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 2 --
 
-Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(1): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 3 --
 
-Warning: opendir(12345): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(12345): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 4 --
 
-Warning: opendir(-2345): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(-2345): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 5 --
 
-Warning: opendir(10.5): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(10.5): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 6 --
 
-Warning: opendir(-10.5): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(-10.5): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 7 --
 
-Warning: opendir(123456789000): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(123456789000): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 8 --
 
-Warning: opendir(1.23456789E-9): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(1.23456789E-9): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 9 --
 
-Warning: opendir(0.5): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(0.5): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 10 --
@@ -166,7 +166,7 @@ bool(false)
 
 -- Iteration 12 --
 
-Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(1): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 13 --
@@ -174,7 +174,7 @@ bool(false)
 
 -- Iteration 14 --
 
-Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(1): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 15 --
@@ -190,7 +190,7 @@ bool(false)
 
 Notice: Array to string conversion in %s on line %d
 
-Warning: opendir(Array): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(Array): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 19 --
@@ -198,7 +198,7 @@ resource(%d) of type (stream)
 
 -- Iteration 20 --
 
-Warning: opendir(string): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(string): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 21 --
@@ -215,7 +215,7 @@ bool(false)
 
 -- Iteration 25 --
 
-Warning: opendir(Resource id #%d): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(Resource id #%d): failed to open dir: %s in %s on line %d
 bool(false)
 ===DONE===
 --UEXPECTF--
@@ -223,47 +223,47 @@ bool(false)
 
 -- Iteration 1 --
 
-Warning: opendir(0): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(0): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 2 --
 
-Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(1): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 3 --
 
-Warning: opendir(12345): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(12345): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 4 --
 
-Warning: opendir(-2345): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(-2345): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 5 --
 
-Warning: opendir(10.5): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(10.5): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 6 --
 
-Warning: opendir(-10.5): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(-10.5): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 7 --
 
-Warning: opendir(123456789000): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(123456789000): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 8 --
 
-Warning: opendir(1.23456789E-9): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(1.23456789E-9): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 9 --
 
-Warning: opendir(0.5): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(0.5): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 10 --
@@ -274,7 +274,7 @@ bool(false)
 
 -- Iteration 12 --
 
-Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(1): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 13 --
@@ -282,7 +282,7 @@ bool(false)
 
 -- Iteration 14 --
 
-Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(1): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 15 --
@@ -298,7 +298,7 @@ bool(false)
 
 Notice: Array to string conversion in %s on line %d
 
-Warning: opendir(Array): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(Array): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 19 --
@@ -306,7 +306,7 @@ resource(%d) of type (stream)
 
 -- Iteration 20 --
 
-Warning: opendir(string): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(string): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Iteration 21 --
@@ -323,6 +323,6 @@ bool(false)
 
 -- Iteration 25 --
 
-Warning: opendir(Resource id #%d): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(Resource id #%d): failed to open dir: %s in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt
index 608d58a83ccb56a684d8f16f1a83b4c4a03d5dc0..47f93f721e9db561f0f8640439ae2a76003b5cb8 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation5.phpt
+++ b/ext/standard/tests/dir/opendir_variation5.phpt
@@ -93,12 +93,12 @@ rmdir($parent_dir_path);
 
 -- After restricting 1st level parent directory --
 
-Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d
+Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- After restricting parent directory --
 
-Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d
+Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d
 bool(false)
 ===DONE===
 --UEXPECTF--
@@ -106,11 +106,11 @@ bool(false)
 
 -- After restricting 1st level parent directory --
 
-Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d
+Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- After restricting parent directory --
 
-Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d
+Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt
index d7d7734822d213dc39b58c8f42c82c52c33c1672..23606643872cb0cd6035424d410be41eed73b60a 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation6.phpt
+++ b/ext/standard/tests/dir/opendir_variation6.phpt
@@ -45,18 +45,18 @@ rmdir($dir_path);
 
 -- Wildcard = '*' --
 
-Warning: opendir(%s/opendir_var*): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/opendir_var*): failed to open dir: %s in %s on line %d
 bool(false)
 
-Warning: opendir(%s/*): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/*): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Wildcard = '?' --
 
-Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: %s in %s on line %d
 bool(false)
 
-Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d
 bool(false)
 ===DONE===
 --UEXPECTF--
@@ -64,17 +64,17 @@ bool(false)
 
 -- Wildcard = '*' --
 
-Warning: opendir(%s/opendir_var*): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/opendir_var*): failed to open dir: %s in %s on line %d
 bool(false)
 
-Warning: opendir(%s/*): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/*): failed to open dir: %s in %s on line %d
 bool(false)
 
 -- Wildcard = '?' --
 
-Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: %s in %s on line %d
 bool(false)
 
-Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: No such file or directory in %s on line %d
+Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d
 bool(false)
 ===DONE===