kraghuba Tue Sep 4 08:39:40 2007 UTC
Modified files:
/php-src/ext/standard/tests/file copy_variation9.phpt
copy_variation15.phpt
fileowner_basic.phpt
copy_variation5.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation9.phpt?r1=1.4&r2=1.5&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.4
php-src/ext/standard/tests/file/copy_variation9.phpt:1.5
--- php-src/ext/standard/tests/file/copy_variation9.phpt:1.4 Thu Aug 23
09:34:15 2007
+++ php-src/ext/standard/tests/file/copy_variation9.phpt Tue Sep 4
08:39:40 2007
@@ -2,8 +2,8 @@
Test copy() function: usage variations - destination file access perms
--SKIPIF--
<?php
-if( (stristr(PHP_OS, "Mac")) || (substr(PHP_OS, 0, 3) == "WIN") )
- die("skip do not run on Win/MacOS");
+if( (stristr(PHP_OS, "Darwin")) || (stristr(PHP_OS, "Win")) )
+ die("skip do not run on MacOS/Windows");
// Skip if being run by root (files are always readable, writeable and
executable)
$filename = dirname(__FILE__)."/copy_variation9_root_check.tmp";
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation15.phpt?r1=1.4&r2=1.5&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.4
php-src/ext/standard/tests/file/copy_variation15.phpt:1.5
--- php-src/ext/standard/tests/file/copy_variation15.phpt:1.4 Thu Aug 23
09:34:15 2007
+++ php-src/ext/standard/tests/file/copy_variation15.phpt Tue Sep 4
08:39:40 2007
@@ -2,8 +2,8 @@
Test copy() function: usage variations - destination dir access perms
--SKIPIF--
<?php
-if( (stristr(PHP_OS, "Mac")) || (substr(PHP_OS, 0, 3) == "WIN") )
- die("skip do not run on Win/MacOS");
+if( (stristr(PHP_OS, "Darwin")) || (stristr(PHP_OS, "Win")) )
+ die("skip do not run on MacOS/Windows");
// Skip if being run by root (files are always readable, writeable and
executable)
$filename = dirname(__FILE__)."/copy_variation15_root_check.tmp";
$fp = fopen($filename, 'w');
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileowner_basic.phpt?r1=1.3&r2=1.4&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.3
php-src/ext/standard/tests/file/fileowner_basic.phpt:1.4
--- php-src/ext/standard/tests/file/fileowner_basic.phpt:1.3 Mon Aug 20
03:40:41 2007
+++ php-src/ext/standard/tests/file/fileowner_basic.phpt Tue Sep 4
08:39:40 2007
@@ -1,10 +1,5 @@
--TEST--
Test fileowner() function: basic functionality
---SKIPIF--
-<?php
-if (!function_exists("posix_getpwuid")) {
- die("skip no posix_getpwuid");
-}
--FILE--
<?php
/* Prototype: int fileowner ( string $filename )
@@ -15,7 +10,7 @@
echo "*** Testing fileowner(): basic functionality ***\n";
echo "-- Testing with the file or directory created by owner --\n";
-var_dump( posix_getpwuid ( fileowner(__FILE__) ) );
+var_dump( fileowner(__FILE__) );
var_dump( fileowner(".") );
var_dump( fileowner("./..") );
@@ -32,12 +27,7 @@
mkdir($dir_name);
var_dump( fileowner($dir_name) );
-echo "\n-- Testing with the standard file or directory --\n";
-var_dump( fileowner("/etc/passwd") );
-var_dump( fileowner("/etc") );
-var_dump( fileowner("/") );
-
-echo "\n*** Done ***\n";
+echo "*** Done ***\n";
?>
--CLEAN--
@@ -52,63 +42,21 @@
--EXPECTF--
*** Testing fileowner(): basic functionality ***
-- Testing with the file or directory created by owner --
-array(7) {
- ["name"]=>
- string(%d) %s
- ["passwd"]=>
- string(%d) "%s"
- ["uid"]=>
- int(%d)
- ["gid"]=>
- int(%d)
- ["gecos"]=>
- string(%d) %s
- ["dir"]=>
- string(%d) %s
- ["shell"]=>
- string(%d) %s
-}
-int(%d)
int(%d)
int(%d)
int(%d)
-
--- Testing with the standard file or directory --
-int(%d)
int(%d)
int(%d)
-
*** Done ***
--UEXPECTF--
*** Testing fileowner(): basic functionality ***
-- Testing with the file or directory created by owner --
-array(7) {
- ["name"]=>
- string(%d) %s
- ["passwd"]=>
- string(%d) "%s"
- ["uid"]=>
- int(%d)
- ["gid"]=>
- int(%d)
- ["gecos"]=>
- string(%d) %s
- ["dir"]=>
- string(%d) %s
- ["shell"]=>
- string(%d) %s
-}
int(%d)
int(%d)
-
-Notice: fwrite(): 26 character unicode buffer downcoded for binary stream
runtime_encoding in %s on line %d
-int(%d)
int(%d)
--- Testing with the standard file or directory --
-int(%d)
+Notice: fwrite(): 26 character unicode buffer downcoded for binary stream
runtime_encoding in %s on line %d
int(%d)
int(%d)
-
*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation5.phpt?r1=1.3&r2=1.4&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.3
php-src/ext/standard/tests/file/copy_variation5.phpt:1.4
--- php-src/ext/standard/tests/file/copy_variation5.phpt:1.3 Mon Aug 20
03:40:41 2007
+++ php-src/ext/standard/tests/file/copy_variation5.phpt Tue Sep 4
08:39:40 2007
@@ -2,8 +2,8 @@
Test copy() function: usage variations - destination file names(case sensitive)
--SKIPIF--
<?php
-if( (stristr(PHP_OS, "Mac")) || (substr(PHP_OS, 0, 3) == "WIN") )
- die("skip do not run on Win/MacOS");
+if( (stristr(PHP_OS, "Darwin")) || (stristr(PHP_OS, "Win")) )
+ die("skip do not run on MacOS/Windows");
?>
--FILE--
<?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
