From: Raghubansh Kumar <kraghuba@php.net>
Date: Mon, 20 Aug 2007 03:37:39 +0000 (+0000)
Subject: fix tests
X-Git-Tag: php-5.2.4RC3~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f0be4f49d8102071d1780da5fce8fa34a561c94;p=php

fix tests
---

diff --git a/ext/standard/tests/file/copy_variation12.phpt b/ext/standard/tests/file/copy_variation12.phpt
index e5a415e9d7..76d386e6e9 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)
diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt
index f3eb6ea04e..b17e7b6a59 100644
--- 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 e3d479b92f..38363fc89e 100644
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 4135dee8a2..cd8be7e1d8 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 1223c09905..5f9cfd0023 100644
--- 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 f9cace11f3..c7b72989eb 100644
--- 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 ***