wharmby Thu Jan 8 10:41:08 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/file lstat_stat_variation3.phpt rename_basic.phpt Log: Fix bogus file tests - addresses 2 failures in PHP GCOV reports. Tested on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_variation3.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/standard/tests/file/lstat_stat_variation3.phpt diff -u php-src/ext/standard/tests/file/lstat_stat_variation3.phpt:1.1.2.3 php-src/ext/standard/tests/file/lstat_stat_variation3.phpt:1.1.2.4 --- php-src/ext/standard/tests/file/lstat_stat_variation3.phpt:1.1.2.3 Thu Jul 26 13:38:24 2007 +++ php-src/ext/standard/tests/file/lstat_stat_variation3.phpt Thu Jan 8 10:41:07 2009 @@ -40,23 +40,24 @@ 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) ); -echo "\n--- Done ---"; ?> - +===Done=== --CLEAN-- <?php $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation3.tmp"); unlink("$file_path/lstat_stat_variation_link3a.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() for link after being renamed *** bool(true) bool(true) bool(true) bool(true) - ---- Done --- +===Done=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_basic.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/file/rename_basic.phpt diff -u php-src/ext/standard/tests/file/rename_basic.phpt:1.1.2.2 php-src/ext/standard/tests/file/rename_basic.phpt:1.1.2.3 --- php-src/ext/standard/tests/file/rename_basic.phpt:1.1.2.2 Wed Apr 30 13:53:49 2008 +++ php-src/ext/standard/tests/file/rename_basic.phpt Thu Jan 8 10:41:07 2009 @@ -8,38 +8,40 @@ echo "*** Testing rename() on non-existing file ***\n"; $file_path = dirname(__FILE__); +require "$file_path/file.inc"; + $src_name = "$file_path/rename_basic.tmp"; $dest_name = "$file_path/rename_basic_new.tmp"; // create the file $fp = fopen($src_name, "w"); -$s1 = stat($src_name); +$old_stat = stat($src_name); fclose($fp); var_dump( rename($src_name, $dest_name) ); // expecting true var_dump( file_exists($src_name) ); // expecting false var_dump( file_exists($dest_name) ); // expecting true -$s2 = stat("$file_path/rename_basic_new.tmp"); +$new_stat = stat("$file_path/rename_basic_new.tmp"); -// checking statistics of old and renamed file - both should be same -for ($i = 0; $i <= 12; $i++) { - if ($s1[$i] != $s2[$i]) { - echo "rename_basic.tmp and rename_basic_new.tmp stat differ at element $i\n"; - } -} +// checking statistics of old and renamed file - both should be same 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) ); -echo "Done\n"; ?> +===Done=== --CLEAN-- <?php unlink(dirname(__FILE__)."/rename_basic.tmp"); unlink(dirname(__FILE__)."/rename_basic_new.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() on non-existing file *** bool(true) bool(false) bool(true) -Done +bool(true) +===Done===
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php