Skip to content

Commit d863d4c

Browse files
committed
ext/standard: refactor Windows codepage tests
Most of the tests do not require the iconv extension. Moreover, due to them being compiled as shared libraries and loaded via the --EXTENSIONS-- section of the test it is highly likely that none of these tests were being run.
1 parent 19deb91 commit d863d4c

File tree

101 files changed

+139
-431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+139
-431
lines changed

ext/standard/tests/file/windows_mb_path/bug54028.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@ Bug #54028 Directory::read() cannot handle non-unicode chars properly
44
mbstring
55
--SKIPIF--
66
<?php
7-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
8-
9-
skip_if_not_win();
7+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
108
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
11-
skip_if_no_required_exts();
12-
139
?>
1410
--FILE--
1511
<?php

ext/standard/tests/file/windows_mb_path/bug54028_2.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
Bug #54028 realpath(".") return false
33
--SKIPIF--
44
<?php
5-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
6-
7-
skip_if_not_win();
5+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
86
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
9-
skip_if_no_required_exts();
10-
117
?>
128
--FILE--
139
<?php

ext/standard/tests/file/windows_mb_path/bug54977.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
Bug #54977 UTF-8 files and folder are not shown
33
--SKIPIF--
44
<?php
5-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
6-
7-
skip_if_not_win();
5+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
86
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
9-
skip_if_no_required_exts();
10-
117
?>
128
--FILE--
139
<?php

ext/standard/tests/file/windows_mb_path/bug61315.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
Bug #61315 stat() fails with specific DBCS characters
33
--SKIPIF--
44
<?php
5-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
6-
7-
skip_if_not_win();
5+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
86
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
9-
skip_if_no_required_exts();
10-
117
?>
128
--FILE--
139
<?php

ext/standard/tests/file/windows_mb_path/bug64506.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
PHP can not read or write file correctly if file name have special char like š
33
--SKIPIF--
44
<?php
5-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
6-
7-
skip_if_not_win();
5+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
86
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
9-
skip_if_no_required_exts();
10-
117
?>
128
--FILE--
139
<?php

ext/standard/tests/file/windows_mb_path/bug64699.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
Bug #64699 is_dir() is inaccurate result on Windows with japanese locale.
33
--SKIPIF--
44
<?php
5-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
6-
7-
skip_if_not_win();
5+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
86
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
9-
skip_if_no_required_exts();
10-
117
?>
128
--FILE--
139
<?php

ext/standard/tests/file/windows_mb_path/bug70903.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
Bug #70903 scandir wrongly interprets the Turkish "ı" character
33
--SKIPIF--
44
<?php
5-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
6-
7-
skip_if_not_win();
5+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
86
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
9-
skip_if_no_required_exts();
10-
117
?>
128
--FILE--
139
<?php

ext/standard/tests/file/windows_mb_path/bug71509.phpt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
--TEST--
22
Bug #71509 Zip problem with swedish letters in filename.
3+
--EXTENSIONS--
4+
zip
35
--SKIPIF--
46
<?php
5-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
6-
7-
skip_if_not_win();
7+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
88
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
9-
skip_if_no_required_exts("zip");
10-
119
?>
1210
--CONFLICTS--
1311
bug71509

ext/standard/tests/file/windows_mb_path/bug74923.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
Bug #74923 Crash when crawling through network share
33
--SKIPIF--
44
<?php
5-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
6-
7-
skip_if_not_win();
5+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
86
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
9-
107
?>
118
--FILE--
129
<?php

ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
Bug #75063 Many filesystem-related functions do not work with multibyte file names, cp1251
33
--SKIPIF--
44
<?php
5-
include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
6-
7-
skip_if_not_win();
5+
if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
86
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
9-
skip_if_no_required_exts();
10-
117
?>
128
--INI--
139
default_charset=cp1251

0 commit comments

Comments
 (0)