Fixed SKIPIF when --disable-mbregex is used

diff --git a/ext/mbstring/tests/bug43301.phpt b/ext/mbstring/tests/bug43301.phpt
index f209bd75542c226060de7ead0c11ee57b95ed5de..ced7651f027a738e71f60cdbf8ca5c4942ace498 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
+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/bug69151.phpt b/ext/mbstring/tests/bug69151.phpt
index 801f27e4a7d32a26eaaa4de75104abdb713faad8..3efc62df1e706246b94c0a544300402bdbca4e7a 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
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg() not available');
+?>
 --FILE--
 <?php
 $str = "\x80";

diff --git a/ext/mbstring/tests/bug72164.phpt b/ext/mbstring/tests/bug72164.phpt
index 8666447e7a9a6dc2f992caf2da2b19b54efd7347..17d4026848baf9f7da4d91030e78c27ab3ad6a26 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
+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
 $var0 = "e";

diff --git a/ext/mbstring/tests/bug72399.phpt b/ext/mbstring/tests/bug72399.phpt
index ba6ffb2cb133306f31aa6dc2b54b47624179a66b..bf18025f1c2cb78a1d3f0223c092a69cb5df0fc3 100644 (file)
--- a/ext/mbstring/tests/bug72399.phpt
+++ b/ext/mbstring/tests/bug72399.phpt
@@ -1,5 +1,10 @@
 --TEST--
 Bug #72399 (Use-After-Free in MBString (search_re))
+--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
 $var5 = mbereg_search_init("","2");

diff --git a/ext/mbstring/tests/bug72402.phpt b/ext/mbstring/tests/bug72402.phpt
index 6e3286cbfa383492ed9d6a7949c70262c676e839..a88da51be7ffe014237decd7dca91ce0259c002f 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
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_replace_callback')) die('skip mb_ereg_replace_callback() not available');
+?>
 --FILE--
 <?php
 function throwit() {

diff --git a/ext/mbstring/tests/bug72691.phpt b/ext/mbstring/tests/bug72691.phpt
index 08f6b153da743e532d1a0161c087ddc2b0672675..64fc131bc67edfe1bad16144511cf33e40602b76 100644 (file)
--- a/ext/mbstring/tests/bug72691.phpt
+++ b/ext/mbstring/tests/bug72691.phpt
@@ -2,7 +2,8 @@
 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 (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php

diff --git a/ext/mbstring/tests/bug72693.phpt b/ext/mbstring/tests/bug72693.phpt
index f269e57f0f1729a30385cf9861a93ac2329716b9..2df2c59d044351b0f21a250b0a6dfb901a74a460 100644 (file)
--- a/ext/mbstring/tests/bug72693.phpt
+++ b/ext/mbstring/tests/bug72693.phpt
@@ -2,7 +2,8 @@
 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 (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php

diff --git a/ext/mbstring/tests/bug72694.phpt b/ext/mbstring/tests/bug72694.phpt
index 90f56a397af9386636600206658521aeceeecd3e..3d4edbedc1d2f109962d9123a232aecffa7d68c9 100644 (file)
--- a/ext/mbstring/tests/bug72694.phpt
+++ b/ext/mbstring/tests/bug72694.phpt
@@ -2,7 +2,8 @@
 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 (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php

diff --git a/ext/mbstring/tests/bug72710.phpt b/ext/mbstring/tests/bug72710.phpt
index 19becc50102f8abab80f81010f39979369dddc7b..811cb7fafe847479a47b9cf2bae3213cae74310d 100644 (file)
--- a/ext/mbstring/tests/bug72710.phpt
+++ b/ext/mbstring/tests/bug72710.phpt
@@ -2,7 +2,8 @@
 Bug #72710 (`mb_ereg` causes buffer overflow on regexp compile error)
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg() not available');
 ?>
 --FILE--
 <?php

diff --git a/ext/mbstring/tests/bug73532.phpt b/ext/mbstring/tests/bug73532.phpt
index 0bc838b0755297bb8e6fb488fcb0f10de8e55efe..63a73f1fc98613380d29476bee654519f66ba5a0 100644 (file)
--- a/ext/mbstring/tests/bug73532.phpt
+++ b/ext/mbstring/tests/bug73532.phpt
@@ -1,5 +1,10 @@
 --TEST--
 Bug #73532 (Null pointer dereference in mb_eregi)
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_eregi')) die('skip mb_eregi() 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 a6aefb22d44b8f61f602bafa45aa1044cea07233..bac8fd8ae1fc41f9f081f4ed46313a475f3d053e 100644 (file)
--- a/ext/mbstring/tests/bug73646.phpt
+++ b/ext/mbstring/tests/bug73646.phpt
@@ -1,5 +1,10 @@
 --TEST--
 Bug #73646 (mb_ereg_search_init null pointer dereference)
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() 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/empty_pattern.phpt b/ext/mbstring/tests/empty_pattern.phpt
index 10b03309bcbf7d500c37ea3f504f5401ed70615a..c56adfdfffc1236fbd6660cb4353656ea374f1aa 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
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
+?>
 --FILE--
 <?php
 

diff --git a/ext/mbstring/tests/mb_ereg_search_pos.phpt b/ext/mbstring/tests/mb_ereg_search_pos.phpt
index df225549d6c8ba7f22cb3db64b2eb90aef6413dd..374d00869dffbdbf0a24bf41afa2a4dbab576ebc 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_search_pos.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_pos.phpt
@@ -2,7 +2,8 @@
 mb_ereg_search_pos() # a test for the basic function of mb_ereg_search_pos
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('skip mbstring not enabled');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php

diff --git a/ext/mbstring/tests/mb_ereg_search_setpos.phpt b/ext/mbstring/tests/mb_ereg_search_setpos.phpt
index 60237f04a1d104e3e49453e19205de02543b7308..601989aa9a15d3ce3d8e7b8ab1a87f7062121162 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_search_setpos.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_setpos.phpt
@@ -2,7 +2,8 @@
 mb_ereg_search_setpos() function
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('skip mbstring not enabled');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php