com php-src: Add missing skip conditions: ext/mbstring/tests/bug43301.phpt ext/mbstring/tests/bug69151.phpt ext/mbstring/tests/bug72164.phpt
ext/mbstring/tests/bug72399.phpt ext/mbstring/tests/bug72402.phpt ext/mbstring/tests/bug72691.phpt ext/mbstring/tests/bug72693.phpt
ext/mbstring/tests/bug72694.phpt ext/mbstring/tests/bug72710.phpt ext/mbstring/tests/bug73532.phpt ext/mbstring/tests/bug73646.phpt
ext/mbstring/tests/empty_pattern.phpt
| From: | Christoph Michael Becker | Date: | Sat, 04 Aug 2018 22:01:35 +0000 |
| Subject: | com php-src: Add missing skip conditions: ext/mbstring/tests/bug43301.phpt ext/mbstring/tests/bug69151.phpt ext/mbstring/tests/bug72164.phpt ext/mbstring/tests/bug72399.phpt ext/mbstring/tests/bug72402.phpt ext/mbstring/tests/bug72691.phpt ext/mbstring/tests/bug72693.phpt ext/mbstring/tests/bug72694.phpt ext/mbstring/tests/bug72710.phpt ext/mbstring/tests/bug73532.phpt ext/mbstring/tests/bug73646.phpt ext/mbstring/tests/empty_pattern.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102816@lists.php.net to get a copy of this message | ||
Commit: a003af5b62f802da5e1e0563741284cb5e622957
Author: Christoph M. Becker <cmbecker69@gmx.de> Sun, 5 Aug 2018 00:01:35 +0200
Parents: 70ecb6e50b983419f6a2d5e028f9779354047ec1
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a003af5b62f802da5e1e0563741284cb5e622957
Log:
Add missing skip conditions
mbstring can be built without mbregex support, in which case these
tests would fail. Thus we add respective skip conditions.
Changed paths:
M ext/mbstring/tests/bug43301.phpt
M ext/mbstring/tests/bug69151.phpt
M ext/mbstring/tests/bug72164.phpt
M ext/mbstring/tests/bug72399.phpt
M ext/mbstring/tests/bug72402.phpt
M ext/mbstring/tests/bug72691.phpt
M ext/mbstring/tests/bug72693.phpt
M ext/mbstring/tests/bug72694.phpt
M ext/mbstring/tests/bug72710.phpt
M ext/mbstring/tests/bug73532.phpt
M ext/mbstring/tests/bug73646.phpt
M ext/mbstring/tests/empty_pattern.phpt
Diff:
diff --git a/ext/mbstring/tests/bug43301.phpt b/ext/mbstring/tests/bug43301.phpt
index f209bd7..6da3dd6 100644
--- a/ext/mbstring/tests/bug43301.phpt
+++ b/ext/mbstring/tests/bug43301.phpt
@@ -1,7 +1,10 @@
--TEST--
Bug #43301 (mb_ereg*_replace() crashes when replacement string is invalid PHP expression and
'e' option is used)
--SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available');
?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
+?>
--FILE--
<?php
diff --git a/ext/mbstring/tests/bug69151.phpt b/ext/mbstring/tests/bug69151.phpt
index 801f27e..a839e8a 100644
--- a/ext/mbstring/tests/bug69151.phpt
+++ b/ext/mbstring/tests/bug69151.phpt
@@ -1,7 +1,10 @@
--TEST--
Bug #69151 (mb_ereg should reject ill-formed byte sequence)
--SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available');
?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
+?>
--FILE--
<?php
$str = "\x80";
diff --git a/ext/mbstring/tests/bug72164.phpt b/ext/mbstring/tests/bug72164.phpt
index 4757a40..018754e 100644
--- a/ext/mbstring/tests/bug72164.phpt
+++ b/ext/mbstring/tests/bug72164.phpt
@@ -1,7 +1,10 @@
--TEST--
Bug #72164 (Null Pointer Dereference - mb_ereg_replace)
--SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available');
?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
+?>
--FILE--
<?php
$var0 = "e";
diff --git a/ext/mbstring/tests/bug72399.phpt b/ext/mbstring/tests/bug72399.phpt
index 5c643e2..b50ca73 100644
--- a/ext/mbstring/tests/bug72399.phpt
+++ b/ext/mbstring/tests/bug72399.phpt
@@ -1,7 +1,10 @@
--TEST--
Bug #72399 (Use-After-Free in MBString (search_re))
--SKIPIF--
-<?php require 'skipif.inc'; ?>
+<?php
+require 'skipif.inc';
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
+?>
--FILE--
<?php
$var5 = mb_ereg_search_init("","2");
diff --git a/ext/mbstring/tests/bug72402.phpt b/ext/mbstring/tests/bug72402.phpt
index abb290b..fc9eb07 100644
--- a/ext/mbstring/tests/bug72402.phpt
+++ b/ext/mbstring/tests/bug72402.phpt
@@ -1,7 +1,10 @@
--TEST--
Bug #72402: _php_mb_regex_ereg_replace_exec - double free
--SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available');
?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
+?>
--FILE--
<?php
function throwit() {
diff --git a/ext/mbstring/tests/bug72691.phpt b/ext/mbstring/tests/bug72691.phpt
index 08f6b15..7e02342 100644
--- a/ext/mbstring/tests/bug72691.phpt
+++ b/ext/mbstring/tests/bug72691.phpt
@@ -3,6 +3,7 @@ Bug #72691 (mb_ereg_search raises a warning if a match zero-width)
--SKIPIF--
<?php
if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
?>
--FILE--
<?php
diff --git a/ext/mbstring/tests/bug72693.phpt b/ext/mbstring/tests/bug72693.phpt
index f269e57..c9fcdcc 100644
--- a/ext/mbstring/tests/bug72693.phpt
+++ b/ext/mbstring/tests/bug72693.phpt
@@ -3,6 +3,7 @@ Bug #72693 (mb_ereg_search increments search position when a match zero-width)
--SKIPIF--
<?php
if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
?>
--FILE--
<?php
diff --git a/ext/mbstring/tests/bug72694.phpt b/ext/mbstring/tests/bug72694.phpt
index 90f56a3..2945b58 100644
--- a/ext/mbstring/tests/bug72694.phpt
+++ b/ext/mbstring/tests/bug72694.phpt
@@ -3,6 +3,7 @@ Bug #72694 (mb_ereg_search_setpos does not accept a string's last position)
--SKIPIF--
<?php
if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
?>
--FILE--
<?php
diff --git a/ext/mbstring/tests/bug72710.phpt b/ext/mbstring/tests/bug72710.phpt
index 19becc5..e666b0d 100644
--- a/ext/mbstring/tests/bug72710.phpt
+++ b/ext/mbstring/tests/bug72710.phpt
@@ -3,6 +3,7 @@ Bug #72710 (
mb_ereg causes buffer overflow on regexp compile error)
--SKIPIF--
<?php
if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
?>
--FILE--
<?php
diff --git a/ext/mbstring/tests/bug73532.phpt b/ext/mbstring/tests/bug73532.phpt
index 87689d4..7195fc0 100644
--- a/ext/mbstring/tests/bug73532.phpt
+++ b/ext/mbstring/tests/bug73532.phpt
@@ -1,7 +1,10 @@
--TEST--
Bug #73532 (Null pointer dereference in mb_eregi)
--SKIPIF--
-<?php require 'skipif.inc'; ?>
+<?php
+require 'skipif.inc';
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
+?>
--FILE--
<?php
var_dump(mb_eregi("a", "\xf5"));
diff --git a/ext/mbstring/tests/bug73646..phpt b/ext/mbstring/tests/bug73646.phpt
index 43c1dc7..7ac824d 100644
--- a/ext/mbstring/tests/bug73646.phpt
+++ b/ext/mbstring/tests/bug73646.phpt
@@ -1,7 +1,10 @@
--TEST--
Bug #73646 (mb_ereg_search_init null pointer dereference)
--SKIPIF--
-<?php require 'skipif.inc'; ?>
+<?php
+require 'skipif.inc';
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
+?>
--FILE--
<?php
diff --git a/ext/mbstring/tests/empty_pattern.phpt b/ext/mbstring/tests/empty_pattern.phpt
index 10b0330..019ccba 100644
--- a/ext/mbstring/tests/empty_pattern.phpt
+++ b/ext/mbstring/tests/empty_pattern.phpt
@@ -1,7 +1,10 @@
--TEST--
Check for empty pattern
--SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available');
?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
+if (!function_exists('mb_ereg')) die('skip mbregex support not available');
+?>
--FILE--
<?php