From 66fe5012a2f8244be4b4d296190e9f1c1c52544f Mon Sep 17 00:00:00 2001
From: Raghubansh Kumar <kraghuba@php.net>
Date: Mon, 20 Aug 2007 03:40:41 +0000
Subject: [PATCH] fix tests

---
 ext/standard/tests/file/copy_variation12.phpt |   4 ++--
 ext/standard/tests/file/copy_variation15.phpt |   6 +++---
 ext/standard/tests/file/copy_variation4.phpt  | Bin 7656 -> 6946 bytes
 ext/standard/tests/file/copy_variation5.phpt  |   4 ++--
 ext/standard/tests/file/copy_variation9.phpt  |   4 ++--
 ext/standard/tests/file/fileowner_basic.phpt  |  16 ++++++++--------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ext/standard/tests/file/copy_variation12.phpt b/ext/standard/tests/file/copy_variation12.phpt
index 38e4609e9b..ab99813067 100644
--- 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)
@@ -56,7 +56,7 @@ bool(false)
 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 0dd3ea2ab4..12521b76bf 100644
--- a/ext/standard/tests/file/copy_variation15.phpt
+++ b/ext/standard/tests/file/copy_variation15.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Test copy() function: usage variations - destination dir access perms
 --SKIPIF--
+--SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN")
-  die("skip Invalid for Windows");
+if( (substr(PHP_OS, 0, 3) == "WIN") || (stristr(PHP_OS, "Mac")) )
+  die("skip do not run on Win/MacOS");
 ?>
-
 --FILE--
 <?php
 /* Prototype: bool copy ( string $source, string $dest );
diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt
index 8e2ca81738d6a3a88eeeffc9c3eff47ff864a959..c570d6083969da3bb2b4f4622882ad6656bf094c 100644
GIT binary patch
delta 322
zcmaE1y~u2X8t3E<{CeC9`FRRCnR%%SswtBhrPr})S}CX&PmUGM$0Pe+44Z7|WM1AV
hsQ!7p*i^twci_h(yZM<k6Vv7=LT-$BTrkk?0{}09VMPD{

delta 872
zcmZ2v_QHCD8YiRv<VG$%dHv-4g39=^#G=f^lFa-(6TO0r0)_lMg`CX1R0R{$$%VY@
znDjL#e-snLuhh(F@@C<D>Kn=@O1z<=lexvBh;?n281V)Z9Rx?ksc-0J1xY5R&5eR?
PjMNX^(I}ftvnT@qKOrcF

diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt
index c43e7d5f44..9cf5b8f042 100644
--- 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 9e405a8ea8..b7c3a2ffbf 100644
--- a/ext/standard/tests/file/copy_variation9.phpt
+++ b/ext/standard/tests/file/copy_variation9.phpt
@@ -2,8 +2,8 @@
 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
diff --git a/ext/standard/tests/file/fileowner_basic.phpt b/ext/standard/tests/file/fileowner_basic.phpt
index adce3691ea..f3e9370a2e 100644
--- a/ext/standard/tests/file/fileowner_basic.phpt
+++ b/ext/standard/tests/file/fileowner_basic.phpt
@@ -56,7 +56,7 @@ array(7) {
   ["name"]=>
   string(%d) %s
   ["passwd"]=>
-  string(1) "x"
+  string(%d) "%s"
   ["uid"]=>
   int(%d)
   ["gid"]=>
@@ -74,9 +74,9 @@ int(%d)
 int(%d)
 
 -- Testing with the standard file or directory --
-int(0)
-int(0)
-int(0)
+int(%d)
+int(%d)
+int(%d)
 
 *** Done ***
 
@@ -87,7 +87,7 @@ array(7) {
   ["name"]=>
   string(%d) %s
   ["passwd"]=>
-  string(1) "x"
+  string(%d) "%s"
   ["uid"]=>
   int(%d)
   ["gid"]=>
@@ -107,8 +107,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 ***
-- 
2.40.0