- fix or improve tests

- add dump of the array_diff for compare_stats

diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc
index efb425ca42239bbd29c017c5c9e3e690e1d817d7..c241b7f40837d2de363c8d6021820e2feb432f0c 100644 (file)
--- a/ext/standard/tests/file/file.inc
+++ b/ext/standard/tests/file/file.inc
@@ -638,6 +638,8 @@ function compare_stats($stat1, $stat2, $fields, $op = "==", $flag = false ) {
   // if the result is false(i.e values are not as expected), 
   // dump the stat array so that easy to figure out the error
   if ( $result == false ) {
+    echo "\n Dumping diff between stat array 1 and 2...\n";
+    var_dump(array_diff($stat1, $stat2));
     echo "\n Dumping stat array 1...\n";
     var_dump($stat1);
     echo "\n Dumping stat array 2...\n";

diff --git a/ext/standard/tests/file/stat_basic-win32.phpt b/ext/standard/tests/file/stat_basic-win32.phpt
index 6c467d7619f49f8c7aec546714bbe215ad06d1ac..e3e7ea7eb52086b5b98d22585b04849193e8db84 100644 (file)
--- a/ext/standard/tests/file/stat_basic-win32.phpt
+++ b/ext/standard/tests/file/stat_basic-win32.phpt
@@ -80,15 +80,15 @@ array(26) {
   [0]=>
   int(%d)
   [1]=>
-  int(%d)
+  int(0)
   [2]=>
   int(%d)
   [3]=>
   int(%d)
   [4]=>
-  int(%d)
+  int(0)
   [5]=>
-  int(%d)
+  int(0)
   [6]=>
   int(%d)
   [7]=>
@@ -106,15 +106,15 @@ array(26) {
   ["dev"]=>
   int(%d)
   ["ino"]=>
-  int(%d)
+  int(0)
   ["mode"]=>
   int(%d)
   ["nlink"]=>
   int(%d)
   ["uid"]=>
-  int(%d)
+  int(0)
   ["gid"]=>
-  int(%d)
+  int(0)
   ["rdev"]=>
   int(%d)
   ["size"]=>

diff --git a/ext/standard/tests/file/stat_variation8-win32.phpt b/ext/standard/tests/file/stat_variation8-win32.phpt
index 5c11afd02da651b66341ea9dd1bb14e9018a2d99..13b78ebe648d34df89cfde00726f18ecaad87ea3 100644 (file)
--- a/ext/standard/tests/file/stat_variation8-win32.phpt
+++ b/ext/standard/tests/file/stat_variation8-win32.phpt
@@ -34,7 +34,7 @@ echo "\n*** Testing stat(): on file by truncating it to given size ***\n";
 $file_handle = fopen($filename, "w");
 fclose($file_handle);
 
-clearstatcache();
+clearstatcache(true, $filename);
 $old_stat = stat($filename);
 // clear the cache
 sleep(2);
@@ -44,7 +44,7 @@ $file_handle = fopen($filename, "r+");
 var_dump( ftruncate($file_handle, 512) );  // truncate it
 fclose($file_handle);
 
-clearstatcache();
+clearstatcache(true, $filename);
 $new_stat = stat($filename);
 
 // compare self stats
@@ -56,7 +56,7 @@ $affected_members = array(7, 8, 9, 'size', 'atime', 'mtime');
 var_dump( compare_stats($old_stat, $new_stat, $affected_members, '!=') );
 
 // clear the stat
-clearstatcache();  // clear previous size value in cache
+clearstatcache(true, $filename);  // clear previous size value in cache
 
 echo "\n*** Done ***";
 ?>

diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt
index 9dab92271209c12c01ad67c7a00684473c92a218..4e9eb76b5ce368698258c5308b6cf49c2921efcd 100644 (file)
--- a/ext/standard/tests/file/tempnam_variation3-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation3-win32.phpt
@@ -78,9 +78,10 @@ File name is => %s
 File permissions are => 100666
 -- Iteration 7 --
 
-Notice: Array to string conversion in %s on line %d
-File name is => %s
-File permissions are => 100666
+Warning: tempnam() expects parameter 2 to be string, array given in %s on line %d
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
 -- Iteration 8 --
 File name is => %s
 File permissions are => 100666

diff --git a/ext/standard/tests/file/touch.phpt b/ext/standard/tests/file/touch.phpt
index aea68b0d44dd9efcb3685507d0aace379e929e7b..a8b239a79ed9a78c3281d9eb9d89685a9956d35e 100644 (file)
--- a/ext/standard/tests/file/touch.phpt
+++ b/ext/standard/tests/file/touch.phpt
@@ -42,7 +42,7 @@ int(%i)
 bool(true)
 int(100)
 bool(true)
-int(100)
+int(-100)
 
 Warning: touch(): Unable to create file /no/such/file/or/directory because No such file or directory in %s on line %d
 bool(false)