Commit: d80e2e069cd65a9e1c3bf5796ccc8616b625ac45 Author: Anatoliy Belsky <a...@php.net> Tue, 10 Apr 2012 12:47:01 +0200 Parents: 26dbc5ecb455720f49fc4ff707d88e88fafe426d Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d80e2e069cd65a9e1c3bf5796ccc8616b625ac45 Log: Fixed bug 61621 Test fail in ext/standard/tests/dir Bugs: https://bugs.php.net/61621 Changed paths: M ext/standard/tests/dir/dir_variation1.phpt M ext/standard/tests/dir/dir_variation5.phpt M ext/standard/tests/dir/dir_variation6.phpt M ext/standard/tests/dir/dir_variation8.phpt M ext/standard/tests/dir/dir_variation9.phpt M ext/standard/tests/dir/opendir_error2.phpt M ext/standard/tests/dir/opendir_variation1.phpt M ext/standard/tests/dir/opendir_variation6.phpt M ext/standard/tests/dir/scandir_error2.phpt M ext/standard/tests/dir/scandir_variation1.phpt M ext/standard/tests/dir/scandir_variation6.phpt Diff: diff --git a/ext/standard/tests/dir/dir_variation1.phpt b/ext/standard/tests/dir/dir_variation1.phpt index ad912c0..abb4719 100644 --- a/ext/standard/tests/dir/dir_variation1.phpt +++ b/ext/standard/tests/dir/dir_variation1.phpt @@ -1,5 +1,11 @@ --TEST-- Test dir() function : usage variations - unexpected value for 'dir' argument +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt index 2399c63..c7450ea 100644 --- a/ext/standard/tests/dir/dir_variation5.phpt +++ b/ext/standard/tests/dir/dir_variation5.phpt @@ -1,5 +1,11 @@ --TEST-- Test dir() function : usage variations - open a file instead of directory +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* diff --git a/ext/standard/tests/dir/dir_variation6.phpt b/ext/standard/tests/dir/dir_variation6.phpt index e42057e..71cbf1f 100644 --- a/ext/standard/tests/dir/dir_variation6.phpt +++ b/ext/standard/tests/dir/dir_variation6.phpt @@ -1,5 +1,11 @@ --TEST-- Test dir() function : usage variations - non-existent directory +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt index a0b74a3..5ecf449 100644 --- a/ext/standard/tests/dir/dir_variation8.phpt +++ b/ext/standard/tests/dir/dir_variation8.phpt @@ -1,5 +1,11 @@ --TEST-- Test dir() function : usage variations - checking with wildcard characters +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* diff --git a/ext/standard/tests/dir/dir_variation9.phpt b/ext/standard/tests/dir/dir_variation9.phpt index 22f3d5b..458d0b8 100644 --- a/ext/standard/tests/dir/dir_variation9.phpt +++ b/ext/standard/tests/dir/dir_variation9.phpt @@ -1,5 +1,11 @@ --TEST-- Test dir() function : usage variations - relative valid and invalid paths +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt index 0762be2..1c72409 100644 --- a/ext/standard/tests/dir/opendir_error2.phpt +++ b/ext/standard/tests/dir/opendir_error2.phpt @@ -1,5 +1,11 @@ --TEST-- Test opendir() function : error conditions - Non-existent directory +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) diff --git a/ext/standard/tests/dir/opendir_variation1.phpt b/ext/standard/tests/dir/opendir_variation1.phpt index dc10356..8d195e1 100644 --- a/ext/standard/tests/dir/opendir_variation1.phpt +++ b/ext/standard/tests/dir/opendir_variation1.phpt @@ -1,5 +1,11 @@ --TEST-- Test opendir() function : usage variations - different data types as $path arg +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt index 01e8225..f3fc0bd 100644 --- a/ext/standard/tests/dir/opendir_variation6.phpt +++ b/ext/standard/tests/dir/opendir_variation6.phpt @@ -1,5 +1,11 @@ --TEST-- Test opendir() function : usage variations - Different wildcards +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt index 1e99a57..b5bfc28 100644 --- a/ext/standard/tests/dir/scandir_error2.phpt +++ b/ext/standard/tests/dir/scandir_error2.phpt @@ -1,5 +1,11 @@ --TEST-- Test scandir() function : error conditions - Non-existent directory +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) diff --git a/ext/standard/tests/dir/scandir_variation1.phpt b/ext/standard/tests/dir/scandir_variation1.phpt index 84b3565..9988ca3 100644 --- a/ext/standard/tests/dir/scandir_variation1.phpt +++ b/ext/standard/tests/dir/scandir_variation1.phpt @@ -1,5 +1,11 @@ --TEST-- Test scandir() function : usage variations - different data types as $dir arg +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt index 5cb595f..754c615 100644 --- a/ext/standard/tests/dir/scandir_variation6.phpt +++ b/ext/standard/tests/dir/scandir_variation6.phpt @@ -1,5 +1,11 @@ --TEST-- Test scandir() function : usage variations - Wildcards in directory path +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} +?> --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
