indeyets Tue Oct 21 12:45:35 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/file copy_variation15.phpt
copy_variation9.phpt
fnmatch_basic.phpt
fnmatch_error.phpt
fnmatch_variation.phpt
Log:
these tests work just fine on macos-x
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation15.phpt?r1=1.1.2.5.2.1&r2=1.1.2.5.2.2&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.1.2.5.2.1
php-src/ext/standard/tests/file/copy_variation15.phpt:1.1.2.5.2.2
--- php-src/ext/standard/tests/file/copy_variation15.phpt:1.1.2.5.2.1 Mon Nov
5 17:43:20 2007
+++ php-src/ext/standard/tests/file/copy_variation15.phpt Tue Oct 21
12:45:35 2008
@@ -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');
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation9.phpt?r1=1.1.2.5.2.1&r2=1.1.2.5.2.2&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.1.2.5.2.1
php-src/ext/standard/tests/file/copy_variation9.phpt:1.1.2.5.2.2
--- php-src/ext/standard/tests/file/copy_variation9.phpt:1.1.2.5.2.1 Mon Nov
5 17:43:20 2007
+++ php-src/ext/standard/tests/file/copy_variation9.phpt Tue Oct 21
12:45:35 2008
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fnmatch_basic.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fnmatch_basic.phpt
diff -u php-src/ext/standard/tests/file/fnmatch_basic.phpt:1.1.2.2
php-src/ext/standard/tests/file/fnmatch_basic.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/fnmatch_basic.phpt:1.1.2.2 Wed Aug 29
10:11:40 2007
+++ php-src/ext/standard/tests/file/fnmatch_basic.phpt Tue Oct 21 12:45:35 2008
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fnmatch_error.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/fnmatch_error.phpt
diff -u php-src/ext/standard/tests/file/fnmatch_error.phpt:1.1.2.2.2.1
php-src/ext/standard/tests/file/fnmatch_error.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/file/fnmatch_error.phpt:1.1.2.2.2.1 Mon Nov
5 17:43:20 2007
+++ php-src/ext/standard/tests/file/fnmatch_error.phpt Tue Oct 21 12:45:35 2008
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fnmatch_variation.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/fnmatch_variation.phpt
diff -u php-src/ext/standard/tests/file/fnmatch_variation.phpt:1.1.2.2.2.1
php-src/ext/standard/tests/file/fnmatch_variation.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/file/fnmatch_variation.phpt:1.1.2.2.2.1 Mon Nov
5 17:43:20 2007
+++ php-src/ext/standard/tests/file/fnmatch_variation.phpt Tue Oct 21
12:45:35 2008
@@ -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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
