Fixed SKIPIF when --disable-mbregex is used

diff --git a/ext/mbstring/tests/bug77367.phpt b/ext/mbstring/tests/bug77367.phpt
index 3b3e9d5c7c34bf4103017cda0afe292a8524a218..4925852375e16726a1cc6b673cf0f672b8cfeeea 100644 (file)
--- a/ext/mbstring/tests/bug77367.phpt
+++ b/ext/mbstring/tests/bug77367.phpt
@@ -2,8 +2,8 @@
 Bug #77367 (Negative size parameter in mb_split)
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('mbstring extension not available');
-if (!function_exists('mb_split')) die('mb_split() not available');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_split')) die('skip mb_split() not available');
 ?>
 --FILE--
 <?php

diff --git a/ext/mbstring/tests/bug77370.phpt b/ext/mbstring/tests/bug77370.phpt
index d16fcd724d93c55842481c8ed5fd9c2861e0ca8f..365463f90fe0d0553bab15b2251dff372fe97c5c 100644 (file)
--- a/ext/mbstring/tests/bug77370.phpt
+++ b/ext/mbstring/tests/bug77370.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Bug #77370 (Buffer overflow on mb regex functions - fetch_token)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_split')) die('skip mb_split() not available');
+?>
 --FILE--
 <?php
 var_dump(mb_split("   \xfd",""));

diff --git a/ext/mbstring/tests/bug77371.phpt b/ext/mbstring/tests/bug77371.phpt
index 25f5ac9acac263e8295a90b444080a86b8ed3d59..9427a3cd4eda2ca574e4bb56f9aa58ceeedb7c33 100644 (file)
--- a/ext/mbstring/tests/bug77371.phpt
+++ b/ext/mbstring/tests/bug77371.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Bug #77371 (heap buffer overflow in mb regex functions - compile_string_node)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg() not available');
+?>
 --FILE--
 <?php
 var_dump(mb_ereg("()0\xfc00000\xfc00000\xfc00000\xfc",""));

diff --git a/ext/mbstring/tests/bug77381.phpt b/ext/mbstring/tests/bug77381.phpt
index 9768cd34de2d2050086c1a9e2d0ad030d088d9be..5176cc55a839675c66ad584ef61ad4a16c810928 100644 (file)
--- a/ext/mbstring/tests/bug77381.phpt
+++ b/ext/mbstring/tests/bug77381.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Bug #77381 (heap buffer overflow in multibyte match_at)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg() not available');
+?>
 --FILE--
 <?php
 var_dump(mb_ereg("000||0\xfa","0"));

diff --git a/ext/mbstring/tests/bug77418.phpt b/ext/mbstring/tests/bug77418.phpt
index 32577bc98c5797dce723458d9ab125d8705e7c56..4e3130bdd1bc92b1ea71c6bc02f697256998b937 100644 (file)
--- a/ext/mbstring/tests/bug77418.phpt
+++ b/ext/mbstring/tests/bug77418.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Bug #77418 (Heap overflow in utf32be_mbc_to_code)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_split')) die('skip mb_split() not available');
+?>
 --FILE--
 <?php
 mb_regex_encoding("UTF-32");

diff --git a/ext/mbstring/tests/bug77428.phpt b/ext/mbstring/tests/bug77428.phpt
index f153412acbdadfc7b2cc5b925c1d222231549d3f..d387f34b771fa585935c6832ef6a26d17ccb28a0 100644 (file)
--- a/ext/mbstring/tests/bug77428.phpt
+++ b/ext/mbstring/tests/bug77428.phpt
@@ -1,5 +1,10 @@
 --TEST--
 Bug #77428: mb_ereg_replace() doesn't replace a substitution variable 
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not available');
+?>
 --FILE--
 <?php
 

diff --git a/ext/mbstring/tests/bug77514.phpt b/ext/mbstring/tests/bug77514.phpt
index efcbea24d7ffd7e1ead52a0ec065ac22ce498cc1..565a8fd773de0ebc11e112c98af6247ec1c45cc5 100644 (file)
--- a/ext/mbstring/tests/bug77514.phpt
+++ b/ext/mbstring/tests/bug77514.phpt
@@ -1,5 +1,10 @@
 --TEST--
 Bug #77514: mb_ereg_replace() with trailing backslash adds null byte
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not available');
+?>
 --FILE--
 <?php