kraghuba                Mon Aug 20 03:37:39 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard/tests/file    copy_variation9.phpt 
                                        copy_variation12.phpt 
                                        copy_variation15.phpt 
                                        fileowner_basic.phpt 
                                        copy_variation4.phpt 
                                        copy_variation5.phpt 
  Log:
  fix tests
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation9.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation9.phpt
diff -u php-src/ext/standard/tests/file/copy_variation9.phpt:1.1.2.1 
php-src/ext/standard/tests/file/copy_variation9.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/copy_variation9.phpt:1.1.2.1        Fri Aug 
10 02:57:30 2007
+++ php-src/ext/standard/tests/file/copy_variation9.phpt        Mon Aug 20 
03:37:39 2007
@@ -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 );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation12.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation12.phpt
diff -u php-src/ext/standard/tests/file/copy_variation12.phpt:1.1.2.2 
php-src/ext/standard/tests/file/copy_variation12.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/copy_variation12.phpt:1.1.2.2       Sun Aug 
12 17:09:59 2007
+++ php-src/ext/standard/tests/file/copy_variation12.phpt       Mon Aug 20 
03:37:39 2007
@@ -45,7 +45,7 @@
 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)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation15.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation15.phpt
diff -u php-src/ext/standard/tests/file/copy_variation15.phpt:1.1.2.1 
php-src/ext/standard/tests/file/copy_variation15.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/copy_variation15.phpt:1.1.2.1       Fri Aug 
10 02:57:30 2007
+++ php-src/ext/standard/tests/file/copy_variation15.phpt       Mon Aug 20 
03:37:39 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileowner_basic.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/fileowner_basic.phpt
diff -u php-src/ext/standard/tests/file/fileowner_basic.phpt:1.1.2.1 
php-src/ext/standard/tests/file/fileowner_basic.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/fileowner_basic.phpt:1.1.2.1        Wed Jun 
13 22:38:49 2007
+++ php-src/ext/standard/tests/file/fileowner_basic.phpt        Mon Aug 20 
03:37:39 2007
@@ -57,7 +57,7 @@
   ["name"]=>
   string(%d) %s
   ["passwd"]=>
-  string(1) "x"
+  string(%d) "%s"
   ["uid"]=>
   int(%d)
   ["gid"]=>
@@ -75,8 +75,8 @@
 int(%d)
 
 -- Testing with the standard file or directory --
-int(0)
-int(0)
-int(0)
+int(%d)
+int(%d)
+int(%d)
 
 *** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation4.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation4.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation5.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation5.phpt
diff -u php-src/ext/standard/tests/file/copy_variation5.phpt:1.1.2.1 
php-src/ext/standard/tests/file/copy_variation5.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/copy_variation5.phpt:1.1.2.1        Fri Aug 
10 02:57:30 2007
+++ php-src/ext/standard/tests/file/copy_variation5.phpt        Mon Aug 20 
03:37:39 2007
@@ -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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to