Add missing skip conditions

mbstring can be built without mbregex support, in which case these
tests would fail.  Thus we add respective skip conditions.

diff --git a/ext/mbstring/tests/bug43301.phpt b/ext/mbstring/tests/bug43301.phpt
index f209bd75542c226060de7ead0c11ee57b95ed5de..6da3dd6bbe00fb0a4c9648f4c3e2f85fc0045e54 100644 (file)
--- 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 801f27e4a7d32a26eaaa4de75104abdb713faad8..a839e8aa74f5a6a6f7120c1c985e706946e40cea 100644 (file)
--- 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 4757a4045ee110be6845b77f86222651ad20357c..018754e335cbb1c4fdfb0b5ae6edfec199edb63f 100644 (file)
--- 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 5c643e280df7f4b1b5b0137db55d639ec274b8d3..b50ca7369801b35a1d08aab1028f2470519cf54d 100644 (file)
--- 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 abb290bf4d8706ea51ecefd7ea68da62b4194f5d..fc9eb077b99ad505cc5117c15af32ad495bebf92 100644 (file)
--- 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 08f6b153da743e532d1a0161c087ddc2b0672675..7e02342c25035bcd762e586abf6b1666659c2dfe 100644 (file)
--- 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 f269e57f0f1729a30385cf9861a93ac2329716b9..c9fcdcc0e2b4c4a2c87e292ca5f1a9fe50fff99e 100644 (file)
--- 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 90f56a397af9386636600206658521aeceeecd3e..2945b58538138e7b27516de7a198d82dc1356821 100644 (file)
--- 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 19becc50102f8abab80f81010f39979369dddc7b..e666b0dbd6231310ff944b5ffd1db0ef72cc8f27 100644 (file)
--- 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 87689d450ae244ece7497954e7c0f9a7463a7703..7195fc0a689e7f77ba1bb76b5085de28aff417fd 100644 (file)
--- 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 43c1dc7a08597a184c4c805792458b8541a67f2c..7ac824d69cb4d6d129cbd75af61a1296bf0473fa 100644 (file)
--- 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 10b03309bcbf7d500c37ea3f504f5401ed70615a..019ccba02c51d0b13b5a763627108ae1cec5c61a 100644 (file)
--- 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