Fix bogus file tests - addresses 2 failures in PHP GCOV reports. Tested on Windows...

diff --git a/ext/standard/tests/file/lstat_stat_variation3.phpt b/ext/standard/tests/file/lstat_stat_variation3.phpt
index da7a6dacb618ed2fde2bcda84a4b34512e65359f..2a9a96efa02ed8e24c1c8140659ab6b887d31607 100755 (executable)
--- a/ext/standard/tests/file/lstat_stat_variation3.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation3.phpt
@@ -40,23 +40,24 @@ $new_stat = lstat($new_linkname);
 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===

diff --git a/ext/standard/tests/file/rename_basic.phpt b/ext/standard/tests/file/rename_basic.phpt
index 28d3b19889bd09db32a1a8a416c72b5e07289d10..019d9e4540472e5b347125a4638119826cf166ee 100755 (executable)
--- a/ext/standard/tests/file/rename_basic.phpt
+++ b/ext/standard/tests/file/rename_basic.phpt
@@ -8,38 +8,40 @@ Test rename() function: basic functionality
 
 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===