MFB: these tests work just fine on macos-x

diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt
index a6404fcd8d6b04b71f0268ac6594309a3de97ce1..fbf5e7bf9eb36f0f776b40e3391d749b3f6ce650 100644 (file)
--- 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, "Darwin")) || (stristr(PHP_OS, "Win")) )
-  die("skip do not run on MacOS/Windows");
+if(substr(PHP_OS, 0, 3) == 'WIN')
+  die("skip do not run on 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_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt
index ffe6dbe914def99747118a2dc0acc49f22e05549..d078c891bbd50b50c86f62fc13e4cb1f35808983 100644 (file)
--- 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, "Darwin")) || (stristr(PHP_OS, "Win")) )
-  die("skip do not run on MacOS/Windows");
+if(substr(PHP_OS, 0, 3) == 'WIN')
+  die("skip do not run on 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/fnmatch_basic.phpt b/ext/standard/tests/file/fnmatch_basic.phpt
index 0b6db879c28b8e2e5ea42cd904b5369cc120cee5..76fdf9ed6daa512c1685e9d61f99d144c14658ca 100644 (file)
--- a/ext/standard/tests/file/fnmatch_basic.phpt
+++ b/ext/standard/tests/file/fnmatch_basic.phpt
@@ -2,8 +2,8 @@
 Test fnmatch() function: Basic functionality
 --SKIPIF--
 <?php
-if( (stristr(PHP_OS, "Mac")) || (stristr(PHP_OS, "Win")) )
-  die("skip do not run on MacOS/Windows");
+if(substr(PHP_OS, 0, 3) == 'WIN')
+  die("skip do not run on Windows");
 ?>
 --FILE--
 <?php

diff --git a/ext/standard/tests/file/fnmatch_error.phpt b/ext/standard/tests/file/fnmatch_error.phpt
index ded6ac93af1c4fadf193440684d2ef533f8ebe9c..87505738e2acf5df5dafa598c30c8ddb8e98cc25 100644 (file)
--- a/ext/standard/tests/file/fnmatch_error.phpt
+++ b/ext/standard/tests/file/fnmatch_error.phpt
@@ -2,8 +2,8 @@
 Test fnmatch() function: Error conditions
 --SKIPIF--
 <?php
-if( (stristr(PHP_OS, "Mac")) || (stristr(PHP_OS, "Win")) )
-  die("skip do not run on MacOS/Windows");
+if(substr(PHP_OS, 0, 3) == 'WIN')
+  die("skip do not run on Windows");
 ?>
 --FILE--
 <?php

diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt
index c6550ef1d93446eb9e9dd9b12d0a84bd31a3d57f..008d4d5ab427651c27474054ebe91e7c8955214d 100644 (file)
--- a/ext/standard/tests/file/fnmatch_variation.phpt
+++ b/ext/standard/tests/file/fnmatch_variation.phpt
@@ -2,8 +2,8 @@
 Test fnmatch() function: Variations
 --SKIPIF--
 <?php
-if( (stristr(PHP_OS, "Mac")) || (stristr(PHP_OS, "Win")) )
-  die("skip do not run on MacOS/Windows");
+if(substr(PHP_OS, 0, 3) == 'WIN')
+  die("skip do not run on Windows");
 ?>
 --FILE--
 <?php