From: Anatol Belski <ab@php.net>
Date: Fri, 2 Sep 2016 17:37:31 +0000 (+0200)
Subject: Add skipifs to some mb path tests
X-Git-Tag: php-7.2.0alpha1~1369^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=596f488e065800c092a96a061d9732b06999bff3;p=php

Add skipifs to some mb path tests

These were invented primarily to test the multibyte path handling
patch on Windows. How it turns out by PR #2105, some test issues
on some filesystems are possible. Particularly HFS is configurable
to use different ways to save filenames, see
https://developer.apple.com/library/mac/qa/qa1173/_index.html
This makes it impossible to test the filenames byte wise, while
the results are still correct. There are still several other tests
using UTF-8 file names spread over other extensions. So far no
false positives are to see, they don't need to be touched.
---

diff --git a/ext/standard/tests/dir/chdir_basic-win32-mb.phpt b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt
index db08d51f40..8d5b2ff986 100644
--- a/ext/standard/tests/dir/chdir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test chdir() function : basic functionality 
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
diff --git a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt
index a1f08939ed..2b23c90644 100644
--- a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt
+++ b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test chdir() function : error conditions - Non-existent directory
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
diff --git a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt
index 04fbc0bc18..90402f4c49 100644
--- a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt
+++ b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test chdir() function : usage variations - different data type as $directory arg
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
diff --git a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt
index ad1f6b665a..f28d57ab4f 100644
--- a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test chdir() function : usage variations - relative paths
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
diff --git a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt
index 4a871dbe74..2602e292ff 100644
--- a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test closedir() function : basic functionality 
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/closedir_error-win32-mb.phpt b/ext/standard/tests/dir/closedir_error-win32-mb.phpt
index 15e646e124..04c614e33d 100644
--- a/ext/standard/tests/dir/closedir_error-win32-mb.phpt
+++ b/ext/standard/tests/dir/closedir_error-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test closedir() function : error conditions - Pass incorrect number of arguments
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt
index f166bd9f0d..26b4a5b8b7 100644
--- a/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test closedir() function : usage variations - close directory handle twice
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/dir_basic-win32-mb.phpt b/ext/standard/tests/dir/dir_basic-win32-mb.phpt
index a491d23abc..d562c0b7e3 100644
--- a/ext/standard/tests/dir/dir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_basic-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test dir() function : basic functionality
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* 
diff --git a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
index 35f63cb649..a2d482f43e 100644
--- a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test dir() function : usage variations - unexpected value for 'context' argument
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* 
diff --git a/ext/standard/tests/dir/dir_variation4-win32-mb.phpt b/ext/standard/tests/dir/dir_variation4-win32-mb.phpt
index c5bd263f7b..156b836562 100644
--- a/ext/standard/tests/dir/dir_variation4-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_variation4-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test dir() function : usage variations - operate on previously opened directory
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* 
diff --git a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt
index 8a00959049..7ebbaa470f 100644
--- a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test getcwd() function : basic functionality
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : mixed getcwd(void)
diff --git a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt
index 0c94c250be..f9d06bfdb7 100644
--- a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test opendir() function : basic functionality 
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
diff --git a/ext/standard/tests/dir/opendir_error1-win32-mb.phpt b/ext/standard/tests/dir/opendir_error1-win32-mb.phpt
index 71d07073ae..e363de4806 100644
--- a/ext/standard/tests/dir/opendir_error1-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_error1-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test opendir() function : error conditions - Incorrect number of args
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
index e82d32ee5f..3d54638e0d 100644
--- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test opendir() function : usage variations - different data types as $context arg
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
diff --git a/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt
index af6d4fb1b4..74d0a6b982 100644
--- a/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test opendir() function : usage variations - open a directory twice
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
diff --git a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt
index 11ededf573..901b13c4a8 100644
--- a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test opendir() function : usage variations - different relative paths
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
diff --git a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt
index 36f96604e1..90cb81a27d 100644
--- a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test readdir() function : basic functionality 
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/readdir_error-win32-mb.phpt b/ext/standard/tests/dir/readdir_error-win32-mb.phpt
index 511d74c642..1388987259 100644
--- a/ext/standard/tests/dir/readdir_error-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_error-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test readdir() function : error conditions - Incorrect number of args
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt
index 59ea129e2e..bde6d6f1c8 100644
--- a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test readdir() function : usage variations - empty directories
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt
index c2bc84949e..a00e83769f 100644
--- a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test readdir() function : usage variations - sub-directories 
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt
index e8c4ff224c..6540d8e571 100644
--- a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test readdir() function : usage variations - different file names
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt
index 4faadcaf86..db5de28302 100644
--- a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test readdir() function : usage variations - operate on previously opened directory
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt
index e1f134a707..bec721d3c5 100644
--- a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test rewinddir() function : basic functionality 
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt
index d78271e0f6..bc107704a0 100644
--- a/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt
+++ b/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test rewinddir() function : error conditions - incorrect number of args
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt
index 71d40f1147..a3f5e8ecc9 100644
--- a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test rewinddir() function : usage variations - operate on a closed directory
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
diff --git a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt
index ca99cf0ada..a089a0afa3 100644
--- a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : basic functionality 
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
diff --git a/ext/standard/tests/dir/scandir_error1-win32-mb.phpt b/ext/standard/tests/dir/scandir_error1-win32-mb.phpt
index b0ed08a20d..6c1ce72a44 100644
--- a/ext/standard/tests/dir/scandir_error1-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_error1-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : error conditions - Incorrect number of args
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
diff --git a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt
index 435a710fbc..b031a91505 100644
--- a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : usage variations - different sorting constants
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
diff --git a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
index c6eae7cae1..c2b2ed5a17 100644
--- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : usage variations - diff data types as $context arg
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
diff --git a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt
index 8090a276b7..4c85dd75cf 100644
--- a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : usage variations - different relative paths
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
diff --git a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt
index 7ae165fd92..f30645da45 100644
--- a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : usage variations - different file names
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
diff --git a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt
index b4e1aee282..686eca43a6 100644
--- a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : usage variations - different ints as $sorting_order arg
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+  die("skip Valid only on Windows");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])