From f0a7db1c7e044e5af487bacec04908d80189e9ed Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Fri, 15 Nov 2002 14:26:33 +0000
Subject: [PATCH] Added some skipif conditions to handle the case mbstring is
 enabled but mbregex is disabled.

---
 ext/mbstring/tests/mb_ereg-compat-01.phpt         | 1 +
 ext/mbstring/tests/mb_ereg-compat-02.phpt         | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-01.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-02.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-03.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-04.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-05.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-06.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-07.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-08.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-09.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-10.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-11.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-12.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace-compat-13.phpt | 1 +
 ext/mbstring/tests/mb_ereg_replace.phpt           | 2 +-
 ext/mbstring/tests/mb_split-compat-01.phpt        | 1 +
 17 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ext/mbstring/tests/mb_ereg-compat-01.phpt b/ext/mbstring/tests/mb_ereg-compat-01.phpt
index a5a195e7eb..287915bf52 100644
--- a/ext/mbstring/tests/mb_ereg-compat-01.phpt
+++ b/ext/mbstring/tests/mb_ereg-compat-01.phpt
@@ -2,6 +2,7 @@
 mb_ereg() compat test 1
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg') or die("SKIP mb_ereg() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/004.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg-compat-02.phpt b/ext/mbstring/tests/mb_ereg-compat-02.phpt
index d7957d6a93..542a5bcc31 100644
--- a/ext/mbstring/tests/mb_ereg-compat-02.phpt
+++ b/ext/mbstring/tests/mb_ereg-compat-02.phpt
@@ -2,6 +2,7 @@
 mb_ereg() compat test 2
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg') or die("SKIP mb_ereg() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/005.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
index b1e0913e46..122daf2890 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 1
 --SKIPIF--
 extension_loaded('mbstring') or die('skip'); 
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/001.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
index f428c768c0..a1370f3856 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 2
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/002.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
index 8c8a1699e1..565ea5aab0 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 3
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/003.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
index d56965994e..48a9e02ff8 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 4
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/006.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
index 62837d9651..b52eef93fa 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 5
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php 
 /* (counterpart: ext/standard/tests/reg/007.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
index 80571b2d5b..1126612062 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 6
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/008.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
index 7e717c6ff6..6d70ac0f80 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 7
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/010.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
index 711bdf7f4e..e32bf5c470 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 8
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/011.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
index 9133ae913a..6745322dff 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 9
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/012.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
index b3114c4f90..99cf188c71 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 10
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/013.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
index 93ee53f04d..cd58550af4 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 11
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/014.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
index e4dcfdc214..be1f13a20a 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 12
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/015.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
index 79f231d864..d870b4207d 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
@@ -2,6 +2,7 @@
 mb_ereg_replace() compat test 13
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/016.phpt) */
diff --git a/ext/mbstring/tests/mb_ereg_replace.phpt b/ext/mbstring/tests/mb_ereg_replace.phpt
index 6052e9f852..3cf7ceded4 100644
--- a/ext/mbstring/tests/mb_ereg_replace.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
-function_exists('mb_ereg_replace') or die("SKIP");
+function_exists('mb_ereg_replace') or die("SKIP mb_ereg_replace() is not available in this build");
 --FILE--
 <?php
 	mb_regex_set_options( '' );
diff --git a/ext/mbstring/tests/mb_split-compat-01.phpt b/ext/mbstring/tests/mb_split-compat-01.phpt
index 8118278c6d..67818a4c66 100644
--- a/ext/mbstring/tests/mb_split-compat-01.phpt
+++ b/ext/mbstring/tests/mb_split-compat-01.phpt
@@ -2,6 +2,7 @@
 mb_split() compat test 1
 --SKIPIF--
 extension_loaded('mbstring') or die('skip');
+function_exists('mb_split') or die("SKIP mb_split() is not available in this build");
 --FILE--
 <?php
 /* (counterpart: ext/standard/tests/reg/009.phpt) */
-- 
2.40.0