Skip to content

Commit 3d89f92

Browse files
committed
Skip tests for old versions instead of marking them XFAIL
According to commit 0eea9a6[1], these tests fail with old Oniguruma versions; we are not sure which version of Oniguruma is required to let them pass, but at least 6.9.3 is sufficient. [1] <http://git.php.net/?p=php-src.git;a=commit;h=0eea9a642941ab5d4c612f8092f186977afbb73e>
1 parent 70f367d commit 3d89f92

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

ext/mbstring/tests/mbregex_stack_limit.phpt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
--TEST--
22
Test oniguruma stack limit
33
--SKIPIF--
4-
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
5-
--XFAIL--
6-
Travis CI has old oniguruma library
4+
<?php
5+
extension_loaded('mbstring') or die('skip mbstring not available');
6+
if (!function_exists('mb_ereg')) die('skip mb_ereg not available');
7+
if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
8+
die('skip requires Oniguruma 6.9.3');
9+
}
10+
?>
711
--FILE--
812
<?php
913
$s = str_repeat(' ', 30000);

ext/mbstring/tests/mbregex_stack_limit2.phpt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
--TEST--
22
Test oniguruma stack limit
33
--SKIPIF--
4-
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
5-
--XFAIL--
6-
Travis CI has old oniguruma library
4+
<?php
5+
extension_loaded('mbstring') or die('skip mbstring not available');
6+
extension_loaded('iconv') or die('skip iconv not available');
7+
if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace not available');
8+
if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
9+
die('skip requires Oniguruma 6.9.3');
10+
}
11+
?>
712
--FILE--
813
<?php
914
function mb_trim( $string, $chars = "", $chars_array = array() )

0 commit comments

Comments
 (0)