fix tests

4 files changed, 8 insertions, 40 deletions

diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt
index 1278116899..315a1a3fc9 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( (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');
diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt
index cd8be7e1d8..f4b4f01700 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( (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
diff --git a/ext/standard/tests/file/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt
index 1450f3ebc5..e26c6e3bab 100644
--- a/ext/standard/tests/file/copy_variation9.phpt
+++ b/ext/standard/tests/file/copy_variation9.phpt
@@ -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";
diff --git a/ext/standard/tests/file/fileowner_basic.phpt b/ext/standard/tests/file/fileowner_basic.phpt
index c7b72989eb..703a36bed7 100644
--- a/ext/standard/tests/file/fileowner_basic.phpt
+++ b/ext/standard/tests/file/fileowner_basic.phpt
@@ -1,11 +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 )
@@ -16,7 +10,7 @@ if (!function_exists("posix_getpwuid")) {
 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("./..") );
 
@@ -33,12 +27,7 @@ $dir_name = $file_path."/fileowner_basic";
 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--
@@ -53,30 +42,9 @@ rmdir($dir_name);
 --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 ***