fix tests

diff --git a/ext/standard/tests/file/copy_variation12.phpt b/ext/standard/tests/file/copy_variation12.phpt
index e5a415e9d7bc50cf2dff26989bf3d47628866e15..76d386e6e9197f4d895db1c9af706ce584ae9767 100644 (file)
--- a/ext/standard/tests/file/copy_variation12.phpt
+++ b/ext/standard/tests/file/copy_variation12.phpt
@@ -45,7 +45,7 @@ rmdir(dirname(__FILE__)."/copy_variation12");
 Warning: copy(): The first argument to copy() function cannot be a directory in %s/copy_variation12.php on line %d
 bool(false)
 bool(false)
-int(4096)
+int(%d)
 
 Warning: filesize(): stat failed for %s/copy_copy_variation12 in %s/copy_variation12.php on line %d
 bool(false)

diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt
index f3eb6ea04eb8d49953e10d08adfca370ce8e3754..b17e7b6a59afef1f291f11b7db67cc0749884652 100644 (file)
--- a/ext/standard/tests/file/copy_variation15.phpt
+++ b/ext/standard/tests/file/copy_variation15.phpt
@@ -2,8 +2,8 @@
 Test copy() function: usage variations - destination dir access perms
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN")
-  die("skip Invalid for Windows");
+if( (stristr(PHP_OS, "Mac")) || (substr(PHP_OS, 0, 3) == "WIN") )
+  die("skip do not run on Win/MacOS");
 ?>
 --FILE--
 <?php

diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt
index e3d479b92fdda634883c3090cb658623449fc1d1..38363fc89e6d0d014e50c0bf50bc9ade05a0fc1e 100644 (file)
Binary files a/ext/standard/tests/file/copy_variation4.phpt and b/ext/standard/tests/file/copy_variation4.phpt differ

diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt
index 4135dee8a2e111b6b32b20e953f201e6cd8d87c9..cd8be7e1d8b1e6c6749ba095d1788da30959598d 100644 (file)
--- a/ext/standard/tests/file/copy_variation5.phpt
+++ b/ext/standard/tests/file/copy_variation5.phpt
@@ -2,8 +2,8 @@
 Test copy() function: usage variations - destination file names(case sensitive)
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN")
-  die("skip do not run on Windows");
+if( (stristr(PHP_OS, "Mac")) || (substr(PHP_OS, 0, 3) == "WIN") )
+  die("skip do not run on Win/MacOS");
 ?>
 --FILE--
 <?php

diff --git a/ext/standard/tests/file/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt
index 1223c09905dbccf8abee0556d864dd79d06d8512..5f9cfd0023cfb46f086dd40f773bd7faf8d3b7fa 100644 (file)
--- a/ext/standard/tests/file/copy_variation9.phpt
+++ b/ext/standard/tests/file/copy_variation9.phpt
@@ -2,10 +2,9 @@
 Test copy() function: usage variations - destination file access perms 
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN")
-  die("skip Invalid for Windows");
+if( (stristr(PHP_OS, "Mac")) || (substr(PHP_OS, 0, 3) == "WIN") )
+  die("skip do not run on Win/MacOS");
 ?>
-
 --FILE--
 <?php
 /* Prototype: bool copy ( string $source, string $dest );

diff --git a/ext/standard/tests/file/fileowner_basic.phpt b/ext/standard/tests/file/fileowner_basic.phpt
index f9cace11f32ee4ef28c91796cc828aa11bf160f3..c7b72989ebbc5c9131b8e57eb3e625fddc8ef34c 100644 (file)
--- a/ext/standard/tests/file/fileowner_basic.phpt
+++ b/ext/standard/tests/file/fileowner_basic.phpt
@@ -57,7 +57,7 @@ array(7) {
   ["name"]=>
   string(%d) %s
   ["passwd"]=>
-  string(1) "x"
+  string(%d) "%s"
   ["uid"]=>
   int(%d)
   ["gid"]=>
@@ -75,8 +75,8 @@ int(%d)
 int(%d)
 
 -- Testing with the standard file or directory --
-int(0)
-int(0)
-int(0)
+int(%d)
+int(%d)
+int(%d)
 
 *** Done ***