kraghuba Mon Aug 20 03:40:42 2007 UTC
Modified files:
/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.2&r2=1.3&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.2
php-src/ext/standard/tests/file/copy_variation9.phpt:1.3
--- php-src/ext/standard/tests/file/copy_variation9.phpt:1.2 Fri Aug 10
02:58:50 2007
+++ php-src/ext/standard/tests/file/copy_variation9.phpt Mon Aug 20
03:40:41 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation12.phpt?r1=1.3&r2=1.4&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.3
php-src/ext/standard/tests/file/copy_variation12.phpt:1.4
--- php-src/ext/standard/tests/file/copy_variation12.phpt:1.3 Mon Aug 13
08:14:03 2007
+++ php-src/ext/standard/tests/file/copy_variation12.phpt Mon Aug 20
03:40:41 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)
@@ -56,7 +56,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.2&r2=1.3&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.2
php-src/ext/standard/tests/file/copy_variation15.phpt:1.3
--- php-src/ext/standard/tests/file/copy_variation15.phpt:1.2 Fri Aug 10
02:58:50 2007
+++ php-src/ext/standard/tests/file/copy_variation15.phpt Mon Aug 20
03:40:41 2007
@@ -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 );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileowner_basic.phpt?r1=1.2&r2=1.3&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.2
php-src/ext/standard/tests/file/fileowner_basic.phpt:1.3
--- php-src/ext/standard/tests/file/fileowner_basic.phpt:1.2 Wed Jun 13
22:46:37 2007
+++ php-src/ext/standard/tests/file/fileowner_basic.phpt Mon Aug 20
03:40:41 2007
@@ -56,7 +56,7 @@
["name"]=>
string(%d) %s
["passwd"]=>
- string(1) "x"
+ string(%d) "%s"
["uid"]=>
int(%d)
["gid"]=>
@@ -74,9 +74,9 @@
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 @@
["name"]=>
string(%d) %s
["passwd"]=>
- string(1) "x"
+ string(%d) "%s"
["uid"]=>
int(%d)
["gid"]=>
@@ -107,8 +107,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.2&r2=1.3&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.2&r2=1.3&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.2
php-src/ext/standard/tests/file/copy_variation5.phpt:1.3
--- php-src/ext/standard/tests/file/copy_variation5.phpt:1.2 Fri Aug 10
02:58:50 2007
+++ php-src/ext/standard/tests/file/copy_variation5.phpt Mon Aug 20
03:40:41 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
