ant Wed Dec 31 10:36:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/file fseek_ftell_rewind_error2.phpt
symlink_link_linkinfo_is_link_error2.phpt
lstat_stat_variation2.phpt
fseek_ftell_rewind_error3.phpt
fread_error.phpt
fseek_ftell_rewind_error1.phpt
Log:
Revert to the previous version for these tests as they were overwritten by
mistake (checked on Windows but not on Linux... so the six skipped tests may
not work correctly... but they should be ok and I'll watch the test results).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt?r1=1.1.2.2.2.3&r2=1.1.2.2.2.4&diff_format=u
Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
diff -u
php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.3
php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.4
--- php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.3
Tue Dec 30 16:49:43 2008
+++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt Wed Dec
31 10:36:12 2008
@@ -87,7 +87,7 @@
Warning: ftell() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing ftell with closed/unset file handle --
-Warning: ftell(): 5 is not a valid stream resource in %s on line %d
+Warning: ftell(): %d is not a valid stream resource in %s on line %d
bool(false)
Warning: ftell() expects parameter 1 to be resource, null given in %s on line
%d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt?r1=1.1.2.2.2.4&r2=1.1.2.2.2.5&diff_format=u
Index: php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
diff -u
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt:1.1.2.2.2.4
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt:1.1.2.2.2.5
---
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt:1.1.2.2.2.4
Tue Dec 30 16:49:43 2008
+++ php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
Wed Dec 31 10:36:12 2008
@@ -5,7 +5,7 @@
if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip no symlinks on Windows');
}
-if (PHP_INT_SIZE != 4 ) {
+if (PHP_INT_SIZE != 4) {
die("skip this test is for 32bit platform only");
}
?>
@@ -42,6 +42,7 @@
//invalid arguments
var_dump( link(NULL, $linkname) ); // NULL as filename
var_dump( link('', $linkname) ); // empty string as filename
+var_dump( link(' ', $linkname) ); // space as filename
var_dump( link(false, $linkname) ); // boolean false as filename
var_dump( link($filename, NULL) ); // NULL as linkname
var_dump( link($filename, '') ); // '' as linkname
@@ -57,6 +58,7 @@
//invalid arguments
var_dump( is_link(NULL) ); // NULL as linkname
var_dump( is_link('') ); // empty string as linkname
+var_dump( is_link(' ') ); // space as linkname
var_dump( is_link(false) ); // boolean false as linkname
var_dump( is_link($filename) ); // file given to is_link
@@ -75,22 +77,25 @@
Warning: link() expects exactly 2 parameters, 3 given in %s on line %d
NULL
-Warning: link(): %s in %s on line %d
+Warning: link(): No such file or directory in %s on line %d
bool(false)
-Warning: link(): %s in %s on line %d
+Warning: link(): No such file or directory in %s on line %d
bool(false)
-Warning: link(): %s in %s on line %d
+Warning: link(): No such file or directory in %s on line %d
bool(false)
-Warning: link(): %s in %s on line %d
+Warning: link(): No such file or directory in %s on line %d
bool(false)
-Warning: link(): %s in %s on line %d
+Warning: link(): No such file or directory in %s on line %d
bool(false)
-Warning: link(): %s in %s on line %d
+Warning: link(): No such file or directory in %s on line %d
+bool(false)
+
+Warning: link(): No such file or directory in %s on line %d
bool(false)
*** Testing is_link() for error conditions ***
@@ -104,4 +109,6 @@
bool(false)
bool(false)
bool(false)
+bool(false)
Done
+
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_variation2.phpt?r1=1.1.2.3.2.3&r2=1.1.2.3.2.4&diff_format=u
Index: php-src/ext/standard/tests/file/lstat_stat_variation2.phpt
diff -u php-src/ext/standard/tests/file/lstat_stat_variation2.phpt:1.1.2.3.2.3
php-src/ext/standard/tests/file/lstat_stat_variation2.phpt:1.1.2.3.2.4
--- php-src/ext/standard/tests/file/lstat_stat_variation2.phpt:1.1.2.3.2.3
Tue Dec 30 16:49:43 2008
+++ php-src/ext/standard/tests/file/lstat_stat_variation2.phpt Wed Dec 31
10:36:12 2008
@@ -21,13 +21,12 @@
require("file.inc");
/* create temp directory */
-...@rmdir("$file_path/lstat_stat_variation2/"); //ensure that dir doesn't
exists
-mkdir("$file_path/lstat_stat_variation2/"); // temp dir
+mkdir("$file_path/lstat_stat_variation1/"); // temp dir
// renaming a directory and check stat
echo "*** Testing stat() for directory after being renamed ***\n";
-$old_dirname = "$file_path/lstat_stat_variation2";
-$new_dirname = "$file_path/lstat_stat_variation2a";
+$old_dirname = "$file_path/lstat_stat_variation1";
+$new_dirname = "$file_path/lstat_stat_variation1a";
$old_stat = stat($old_dirname);
clearstatcache();
var_dump( rename($old_dirname, $new_dirname) );
@@ -37,8 +36,11 @@
var_dump( compare_self_stat($old_stat) );
var_dump( compare_self_stat($new_stat) );
-// compare the two stats
-var_dump( compare_stats($old_stat, $new_stat, $all_stat_keys) );
+// compare the two stats - all except ctime
+$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12,
+ "dev", "ino", "mode", "nlink", "uid", "gid",
+ "rdev", "size", "atime", "mtime", "blksize", "blocks");
+var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) );
// clear the cache
clearstatcache();
@@ -48,7 +50,7 @@
--CLEAN--
<?php
$file_path = dirname(__FILE__);
-rmdir("$file_path/lstat_stat_variation2a");
+rmdir("$file_path/lstat_stat_variation1a");
?>
--EXPECTF--
*** Testing stat() for directory after being renamed ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt?r1=1.1.2.2.2.3&r2=1.1.2.2.2.4&diff_format=u
Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
diff -u
php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.3
php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.4
--- php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.3
Tue Dec 30 16:49:43 2008
+++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt Wed Dec
31 10:36:12 2008
@@ -87,7 +87,7 @@
Warning: rewind() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing rewind() with closed/unset file handle --
-Warning: rewind(): 5 is not a valid stream resource in %s on line %d
+Warning: rewind(): %d is not a valid stream resource in %s on line %d
bool(false)
Warning: rewind() expects parameter 1 to be resource, null given in %s on line
%d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_error.phpt?r1=1.1.2.1.2.3&r2=1.1.2.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/file/fread_error.phpt
diff -u php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.3
php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.4
--- php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.3 Tue Dec
30 16:49:43 2008
+++ php-src/ext/standard/tests/file/fread_error.phpt Wed Dec 31 10:36:12 2008
@@ -103,7 +103,7 @@
Notice: Undefined variable: file_content_type in %s on line %d
-Warning: fread(): 5 is not a valid stream resource in %s on line %d
+Warning: fread(): %d is not a valid stream resource in %s on line %d
bool(false)
Warning: fread() expects parameter 1 to be resource, null given in %s on line
%d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt?r1=1.1.2.2.2.3&r2=1.1.2.2.2.4&diff_format=u
Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
diff -u
php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.3
php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.4
--- php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.3
Tue Dec 30 16:49:43 2008
+++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt Wed Dec
31 10:36:12 2008
@@ -91,7 +91,7 @@
Warning: fseek() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing fseek() with closed/unset file handle --
-Warning: fseek(): 5 is not a valid stream resource in %s on line %d
+Warning: fseek(): %d is not a valid stream resource in %s on line %d
bool(false)
Warning: fseek() expects parameter 1 to be resource, null given in %s on line
%d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
