jmessa Mon Mar 10 15:20:00 2008 UTC Modified files: /php-src/ext/standard/tests/dir opendir_variation1.phpt opendir_error2.phpt dir_variation7.phpt opendir_variation6.phpt opendir_variation5.phpt Log: - Modified expected output to allow tests to work on all platforms
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation1.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.2 php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_variation1.phpt Mon Mar 10 15:19:59 2008 @@ -115,47 +115,47 @@ -- 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 @@ -- 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 @@ -- 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 @@ 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 @@ -- 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 @@ -- 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 @@ -- 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 @@ -- 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 @@ -- 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 @@ 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 @@ -- 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 @@ -- 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=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_error2.phpt diff -u php-src/ext/standard/tests/dir/opendir_error2.phpt:1.2 php-src/ext/standard/tests/dir/opendir_error2.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_error2.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_error2.phpt Mon Mar 10 15:19:59 2008 @@ -27,12 +27,12 @@ -- 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 @@ -- 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=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation7.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation7.phpt diff -u php-src/ext/standard/tests/dir/dir_variation7.phpt:1.2 php-src/ext/standard/tests/dir/dir_variation7.phpt:1.3 --- php-src/ext/standard/tests/dir/dir_variation7.phpt:1.2 Tue Dec 25 16:14:32 2007 +++ php-src/ext/standard/tests/dir/dir_variation7.phpt Mon Mar 10 15:19:59 2008 @@ -85,21 +85,21 @@ *** 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 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation6.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation6.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation6.phpt:1.2 php-src/ext/standard/tests/dir/opendir_variation6.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_variation6.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_variation6.phpt Mon Mar 10 15:19:59 2008 @@ -45,18 +45,18 @@ -- 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 @@ -- 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=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation5.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation5.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.4 php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.5 --- php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.4 Fri Mar 7 16:07:34 2008 +++ php-src/ext/standard/tests/dir/opendir_variation5.phpt Mon Mar 10 15:19:59 2008 @@ -93,12 +93,12 @@ -- 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 @@ -- 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===
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php