- 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 bb10e607a38aaf314e36913d07f9695f0fb69599..ca168f90aaaf37ece55979aed6e676b1190efaa5 100644 (file)
--- a/ext/standard/tests/dir/dir_variation7.phpt
+++ b/ext/standard/tests/dir/dir_variation7.phpt
@@ -85,10 +85,10 @@ 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
\ No newline at end of file

diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt
index 9b3a110bcde68bf9daa3cd41fe1925f0a1f29d21..0762be2ad3095bb2449c90efb00588ade8bf8869 100644 (file)
--- a/ext/standard/tests/dir/opendir_error2.phpt
+++ b/ext/standard/tests/dir/opendir_error2.phpt
@@ -27,11 +27,11 @@ 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===

diff --git a/ext/standard/tests/dir/opendir_variation1.phpt b/ext/standard/tests/dir/opendir_variation1.phpt
index bcf64dd26e46bc42b9cbd726a49765bad82c1a61..dc10356f565ee0cd1c91bd4836d3029d26110154 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 --
@@ -196,7 +196,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 --

diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt
index 2e4497470cb4d404769dca05bebdfa6f15f40783..f9bb38c68ecfa160266e60b5487e0655c997f9cd 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation5.phpt
+++ b/ext/standard/tests/dir/opendir_variation5.phpt
@@ -93,11 +93,11 @@ 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===

diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt
index 29dfd948e9cfd353435c15d8e9d38b1e7a5f65a3..01e8225d59354aedcbe6cb4c733ecc87da891722 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation6.phpt
+++ b/ext/standard/tests/dir/opendir_variation6.phpt
@@ -45,17 +45,17 @@ 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===