diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-01-26 15:12:19 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-01-26 15:12:19 -0800 |
| commit | de62be2682c22ecdd93b9900d3cfb68f88610367 (patch) | |
| tree | d8bd5e1e7660c056f1597a083baac8420cb6b7f3 | |
| parent | c2bb54a246272fb8430002b46450300f27952330 (diff) | |
| parent | dfe66284402528680704aa28e3e4f148fe0ca667 (diff) | |
| download | php-git-de62be2682c22ecdd93b9900d3cfb68f88610367.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
XFAIL multibyte tests until they are fixed (bug 66582)
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-02.phpt | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-06.phpt | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-07.phpt | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-09.phpt | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-10.phpt | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-11.phpt | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-12.phpt | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt index 494b504129..8e15ae8849 100644 --- a/ext/mbstring/tests/zend_multibyte-02.phpt +++ b/ext/mbstring/tests/zend_multibyte-02.phpt @@ -1,6 +1,8 @@ --TEST-- zend multibyte (2) --SKIPIF-- +--XFAIL-- +https://bugs.php.net/bug.php?id=66582 --INI-- zend.multibyte=On zend.script_encoding=UTF-8 diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt index 95fdd78c31..024a67bbb6 100644 --- a/ext/mbstring/tests/zend_multibyte-06.phpt +++ b/ext/mbstring/tests/zend_multibyte-06.phpt @@ -1,6 +1,8 @@ --TEST-- zend multibyte (6) --SKIPIF-- +--XFAIL-- +https://bugs.php.net/bug.php?id=66582 --INI-- zend.multibyte=On zend.script_encoding=EUC-JP diff --git a/ext/mbstring/tests/zend_multibyte-07.phpt b/ext/mbstring/tests/zend_multibyte-07.phpt index 3c79f84f57..08db1d0f70 100644 --- a/ext/mbstring/tests/zend_multibyte-07.phpt +++ b/ext/mbstring/tests/zend_multibyte-07.phpt @@ -1,6 +1,8 @@ --TEST-- zend multibyte (7) --SKIPIF-- +--XFAIL-- +https://bugs.php.net/bug.php?id=66582 --INI-- zend.multibyte=On zend.script_encoding=ISO-8859-1 diff --git a/ext/mbstring/tests/zend_multibyte-09.phpt b/ext/mbstring/tests/zend_multibyte-09.phpt index c088e7cddf..8ad00b4e1e 100644 --- a/ext/mbstring/tests/zend_multibyte-09.phpt +++ b/ext/mbstring/tests/zend_multibyte-09.phpt @@ -1,6 +1,8 @@ --TEST-- zend multibyte (9) --SKIPIF-- +--XFAIL-- +https://bugs.php.net/bug.php?id=66582 --INI-- zend.multibyte=On zend.script_encoding=cp1251 diff --git a/ext/mbstring/tests/zend_multibyte-10.phpt b/ext/mbstring/tests/zend_multibyte-10.phpt index a5ba74d50d..4d448a8ccf 100644 --- a/ext/mbstring/tests/zend_multibyte-10.phpt +++ b/ext/mbstring/tests/zend_multibyte-10.phpt @@ -1,6 +1,8 @@ --TEST-- zend multibyte (10) --SKIPIF-- +--XFAIL-- +https://bugs.php.net/bug.php?id=66582 --FILE-- <?php declare(encoding="ISO-8859-15"); diff --git a/ext/mbstring/tests/zend_multibyte-11.phpt b/ext/mbstring/tests/zend_multibyte-11.phpt index 0b59e75fb5..91a7d8c44b 100644 --- a/ext/mbstring/tests/zend_multibyte-11.phpt +++ b/ext/mbstring/tests/zend_multibyte-11.phpt @@ -1,6 +1,8 @@ --TEST-- zend multibyte (11) --SKIPIF-- +--XFAIL-- +https://bugs.php.net/bug.php?id=66582 --FILE-- <?php declare(encoding="ISO-8859-15") { diff --git a/ext/mbstring/tests/zend_multibyte-12.phpt b/ext/mbstring/tests/zend_multibyte-12.phpt index d7207e49d7..2f2606244c 100644 --- a/ext/mbstring/tests/zend_multibyte-12.phpt +++ b/ext/mbstring/tests/zend_multibyte-12.phpt @@ -1,6 +1,8 @@ --TEST-- zend multibyte (12) --SKIPIF-- +--XFAIL-- +https://bugs.php.net/bug.php?id=66582 --FILE-- <?php declare(encoding="ISO-8859-15"); |