diff options
author | Alexey Zakhlestin <indeyets@php.net> | 2008-10-21 12:48:37 +0000 |
---|---|---|
committer | Alexey Zakhlestin <indeyets@php.net> | 2008-10-21 12:48:37 +0000 |
commit | d8393b570ca62042e0b9ee137e0d03433b1a9e82 (patch) | |
tree | 809ea865cb052541f0fc0076791f6479d984cb0d | |
parent | 4cdeb0e8083df440573ea33363ace8ddc7e004ea (diff) | |
download | php-git-d8393b570ca62042e0b9ee137e0d03433b1a9e82.tar.gz |
MFB: these tests work just fine on macos-x
-rw-r--r-- | ext/standard/tests/file/copy_variation15.phpt | 4 | ||||
-rw-r--r-- | ext/standard/tests/file/copy_variation9.phpt | 4 | ||||
-rw-r--r-- | ext/standard/tests/file/fnmatch_basic.phpt | 4 | ||||
-rw-r--r-- | ext/standard/tests/file/fnmatch_error.phpt | 4 | ||||
-rw-r--r-- | ext/standard/tests/file/fnmatch_variation.phpt | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt index a6404fcd8d..fbf5e7bf9e 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, "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 ffe6dbe914..d078c891bb 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, "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 0b6db879c2..76fdf9ed6d 100644 --- 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 ded6ac93af..87505738e2 100644 --- 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 c6550ef1d9..008d4d5ab4 100644 --- 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 |