pajoye Tue, 10 Jan 2012 08:30:00 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=322003
Log:
- make it windows version independent, error msg differs, bad but well
Changed paths:
A
php/php-src/branches/PHP_5_3/ext/standard/tests/dir/opendir_variation6-win32.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/dir/opendir_variation6-win32.phpt
A php/php-src/trunk/ext/standard/tests/dir/opendir_variation6-win32.phpt
Added:
php/php-src/branches/PHP_5_3/ext/standard/tests/dir/opendir_variation6-win32.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/dir/opendir_variation6-win32.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/dir/opendir_variation6-win32.phpt
2012-01-10 08:30:00 UTC (rev 322003)
@@ -0,0 +1,75 @@
+--TEST--
+Test opendir() function : usage variations - Different wildcards
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+ die("skip Valid only on Windows");
+}
+?>
+--FILE--
+<?php
+/* Prototype : mixed opendir(string $path[, resource $context])
+ * Description: Open a directory and return a dir_handle
+ * Source code: ext/standard/dir.c
+ */
+
+/*
+ * Pass paths containing wildcards to test if opendir() recognises them
+ */
+
+echo "*** Testing opendir() : usage variations ***\n";
+// create the temporary directories
+$file_path = dirname(__FILE__);
+$dir_path = $file_path . "/opendir_variation6";
+$sub_dir_path = $dir_path . "/sub_dir1";
+
+mkdir($dir_path);
+mkdir($sub_dir_path);
+
+// with different wildcard characters
+
+echo "\n-- Wildcard = '*' --\n";
+var_dump( opendir($file_path . "/opendir_var*") );
+var_dump( opendir($file_path . "/*") );
+
+echo "\n-- Wildcard = '?' --\n";
+var_dump( opendir($dir_path . "/sub_dir?") );
+var_dump( opendir($dir_path . "/sub?dir1") );
+
+?>
+===DONE===
+--CLEAN--
+<?php
+$dir_path = dirname(__FILE__) . "/opendir_variation6";
+$sub_dir_path = $dir_path . "/sub_dir1";
+
+rmdir($sub_dir_path);
+rmdir($dir_path);
+?>
+--EXPECTF--
+*** Testing opendir() : usage variations ***
+
+-- Wildcard = '*' --
+
+Warning: opendir(%s/opendir_var*,%s/opendir_var*): %s 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/*,%s/*): %s 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?,%s/opendir_variation6/sub_dir?): %s 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,%s/opendir_variation6/sub?dir1): %s 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===
Modified:
php/php-src/branches/PHP_5_4/ext/standard/tests/dir/opendir_variation6-win32.phpt
===================================================================
---
php/php-src/branches/PHP_5_4/ext/standard/tests/dir/opendir_variation6-win32.phpt
2012-01-10 08:07:35 UTC (rev 322002)
+++
php/php-src/branches/PHP_5_4/ext/standard/tests/dir/opendir_variation6-win32.phpt
2012-01-10 08:30:00 UTC (rev 322003)
@@ -51,24 +51,24 @@
-- Wildcard = '*' --
-Warning: opendir(%s/opendir_var*,%s/opendir_var*): No such file or directory
in %s on line %d
+Warning: opendir(%s/opendir_var*,%s/opendir_var*): %s 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/*,%s/*): No such file or directory in %s on line %d
+Warning: opendir(%s/*,%s/*): %s 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?,%s/opendir_variation6/sub_dir?): No such
file or directory in %s on line %d
+Warning:
opendir(%s/opendir_variation6/sub_dir?,%s/opendir_variation6/sub_dir?): %s 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,%s/opendir_variation6/sub?dir1): No such
file or directory in %s on line %d
+Warning:
opendir(%s/opendir_variation6/sub?dir1,%s/opendir_variation6/sub?dir1): %s in
%s on line %d
Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s
on line %d
bool(false)
Added: php/php-src/trunk/ext/standard/tests/dir/opendir_variation6-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/dir/opendir_variation6-win32.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/dir/opendir_variation6-win32.phpt
2012-01-10 08:30:00 UTC (rev 322003)
@@ -0,0 +1,75 @@
+--TEST--
+Test opendir() function : usage variations - Different wildcards
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+ die("skip Valid only on Windows");
+}
+?>
+--FILE--
+<?php
+/* Prototype : mixed opendir(string $path[, resource $context])
+ * Description: Open a directory and return a dir_handle
+ * Source code: ext/standard/dir.c
+ */
+
+/*
+ * Pass paths containing wildcards to test if opendir() recognises them
+ */
+
+echo "*** Testing opendir() : usage variations ***\n";
+// create the temporary directories
+$file_path = dirname(__FILE__);
+$dir_path = $file_path . "/opendir_variation6";
+$sub_dir_path = $dir_path . "/sub_dir1";
+
+mkdir($dir_path);
+mkdir($sub_dir_path);
+
+// with different wildcard characters
+
+echo "\n-- Wildcard = '*' --\n";
+var_dump( opendir($file_path . "/opendir_var*") );
+var_dump( opendir($file_path . "/*") );
+
+echo "\n-- Wildcard = '?' --\n";
+var_dump( opendir($dir_path . "/sub_dir?") );
+var_dump( opendir($dir_path . "/sub?dir1") );
+
+?>
+===DONE===
+--CLEAN--
+<?php
+$dir_path = dirname(__FILE__) . "/opendir_variation6";
+$sub_dir_path = $dir_path . "/sub_dir1";
+
+rmdir($sub_dir_path);
+rmdir($dir_path);
+?>
+--EXPECTF--
+*** Testing opendir() : usage variations ***
+
+-- Wildcard = '*' --
+
+Warning: opendir(%s/opendir_var*,%s/opendir_var*): %s 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/*,%s/*): %s 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?,%s/opendir_variation6/sub_dir?): %s 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,%s/opendir_variation6/sub?dir1): %s 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===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
