From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 30 Sep 2019 12:12:40 +0000 (+0200)
Subject: Skip tests for old versions instead of marking them XFAIL
X-Git-Tag: php-7.4.0RC3~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d89f92784668b71a506c8304fa2c2f96f0753e3;p=php

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>
---

diff --git a/ext/mbstring/tests/mbregex_stack_limit.phpt b/ext/mbstring/tests/mbregex_stack_limit.phpt
index a678e3b4f7..ccd763e2b5 100644
--- a/ext/mbstring/tests/mbregex_stack_limit.phpt
+++ b/ext/mbstring/tests/mbregex_stack_limit.phpt
@@ -1,9 +1,13 @@
 --TEST--
 Test oniguruma stack limit
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---XFAIL--
-Travis CI has old oniguruma library
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg not available');
+if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
+    die('skip requires Oniguruma 6.9.3');
+}
+?>
 --FILE--
 <?php
 $s = str_repeat(' ', 30000);
diff --git a/ext/mbstring/tests/mbregex_stack_limit2.phpt b/ext/mbstring/tests/mbregex_stack_limit2.phpt
index 3ddff10f81..88b1430fc6 100644
--- a/ext/mbstring/tests/mbregex_stack_limit2.phpt
+++ b/ext/mbstring/tests/mbregex_stack_limit2.phpt
@@ -1,9 +1,14 @@
 --TEST--
 Test oniguruma stack limit
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---XFAIL--
-Travis CI has old oniguruma library
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
+extension_loaded('iconv') or die('skip iconv not available');
+if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace not available');
+if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
+    die('skip requires Oniguruma 6.9.3');
+}
+?>
 --FILE--
 <?php
 function mb_trim( $string, $chars = "", $chars_array = array() )