kraghuba Thu Jul 5 18:53:34 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/file
symlink_link_linkinfo_is_link_error1.phpt
symlink_link_linkinfo_is_link_error2.phpt
symlink_link_linkinfo_is_link_variation1.phpt
symlink_link_linkinfo_is_link_variation2.phpt
symlink_link_linkinfo_is_link_variation3.phpt
symlink_link_linkinfo_is_link_variation4.phpt
symlink_link_linkinfo_is_link_variation5.phpt
symlink_link_linkinfo_is_link_basic1.phpt
symlink_link_linkinfo_is_link_variation6.phpt
symlink_link_linkinfo_is_link_basic2.phpt
symlink_link_linkinfo_is_link_variation7.phpt
symlink_link_linkinfo_is_link_variation8.phpt
symlink_link_linkinfo_is_link_variation9.phpt
Modified files:
/php-src/ext/standard/tests/file filegroup_basic.phpt
006_error.phpt
Log:
fix test: 006_error.phpt & filegroup_basic.phpt
fix and smaller tests for
symlink_link_linkinfo_is_link[basic|error|variation].phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filegroup_basic.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/filegroup_basic.phpt
diff -u php-src/ext/standard/tests/file/filegroup_basic.phpt:1.1.2.1
php-src/ext/standard/tests/file/filegroup_basic.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/filegroup_basic.phpt:1.1.2.1 Wed Jun
13 22:38:49 2007
+++ php-src/ext/standard/tests/file/filegroup_basic.phpt Thu Jul 5
18:53:33 2007
@@ -2,8 +2,8 @@
Test filegroup() function: basic functionality
--SKIPIF--
<?php
-if (!function_exists("posix_getgrgid")) {
- die("skip no posix_getgrgid");
+if( substr(PHP_OS, 0, 3) == 'WIN') {
+ die('skip Not valid for Windows');
}
?>
--FILE--
@@ -17,7 +17,7 @@
echo "-- Testing with the file or directory created by owner --\n";
$file_path = dirname(__FILE__);
-var_dump( posix_getgrgid( filegroup(__FILE__) ) );
+var_dump( filegroup(__FILE__) );
var_dump( filegroup(".") );
var_dump( filegroup("./..") );
@@ -55,25 +55,15 @@
--EXPECTF--
*** Testing filegroup(): basic functionality ***
-- Testing with the file or directory created by owner --
-array(4) {
- ["name"]=>
- string(%d) "%s"
- ["passwd"]=>
- string(1) "x"
- ["members"]=>
- array(0) {
- }
- ["gid"]=>
- int(%d)
-}
+int(%d)
int(%d)
int(%d)
int(%d)
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/006_error.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/006_error.phpt
diff -u php-src/ext/standard/tests/file/006_error.phpt:1.1.2.1
php-src/ext/standard/tests/file/006_error.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/006_error.phpt:1.1.2.1 Mon Jun 11
16:14:59 2007
+++ php-src/ext/standard/tests/file/006_error.phpt Thu Jul 5 18:53:33 2007
@@ -5,9 +5,17 @@
if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip Not on Windows');
}
-elseif (get_current_user() == 'root') {
- die( "skip Do not run with root permissions" );
+// Skip if being run by root
+$filename = dirname(__FILE__)."/006_root_check.tmp";
+$fp = fopen($filename, 'w');
+fclose($fp);
+if(fileowner($filename) == 0) {
+ unlink ($filename);
+ die('skip...cannot be run as root\n');
}
+
+unlink($filename);
+
?>
--FILE--
<?php
@@ -60,11 +68,11 @@
--EXPECTF--
*** Testing error conditions for fileperms(), chmod() ***
-Warning: chmod(): Operation not permitted in %s on line %d
+Warning: chmod(): %s in %s on line %d
bool(false)
100644
-Warning: chmod(): Operation not permitted in %s on line %d
+Warning: chmod(): %s in %s on line %d
bool(false)
40755
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
+++ php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
+++ php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt?view=markup&rev=1.1
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation2.phpt?view=markup&rev=1.1
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation2.phpt
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation2.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt?view=markup&rev=1.1
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt?view=markup&rev=1.1
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation5.phpt?view=markup&rev=1.1
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation5.phpt
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation5.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt
+++ php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt?view=markup&rev=1.1
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
+++ php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt?view=markup&rev=1.1
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation8.phpt?view=markup&rev=1.1
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation8.phpt
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation8.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt?view=markup&rev=1.1
Index:
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt
+++
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
