moriyoshi Fri Nov 15 09:26:34 2002 EDT
Modified files:
/php4/ext/mbstring/tests mb_ereg-compat-01.phpt
mb_ereg-compat-02.phpt
mb_ereg_replace-compat-01.phpt
mb_ereg_replace-compat-02.phpt
mb_ereg_replace-compat-03.phpt
mb_ereg_replace-compat-04.phpt
mb_ereg_replace-compat-05.phpt
mb_ereg_replace-compat-06.phpt
mb_ereg_replace-compat-07.phpt
mb_ereg_replace-compat-08.phpt
mb_ereg_replace-compat-09.phpt
mb_ereg_replace-compat-10.phpt
mb_ereg_replace-compat-11.phpt
mb_ereg_replace-compat-12.phpt
mb_ereg_replace-compat-13.phpt
mb_ereg_replace.phpt
mb_split-compat-01.phpt
Log:
Added some skipif conditions to handle the case mbstring is enabled but mbregex is
disabled.
Index: php4/ext/mbstring/tests/mb_ereg-compat-01.phpt
diff -u php4/ext/mbstring/tests/mb_ereg-compat-01.phpt:1.2
php4/ext/mbstring/tests/mb_ereg-compat-01.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg-compat-01.phpt:1.2 Wed Oct 30 02:53:15 2002
+++ php4/ext/mbstring/tests/mb_ereg-compat-01.phpt Fri Nov 15 09:26:33 2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg-compat-02.phpt
diff -u php4/ext/mbstring/tests/mb_ereg-compat-02.phpt:1.2
php4/ext/mbstring/tests/mb_ereg-compat-02.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg-compat-02.phpt:1.2 Wed Oct 30 02:53:15 2002
+++ php4/ext/mbstring/tests/mb_ereg-compat-02.phpt Fri Nov 15 09:26:33 2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt:1.2 Wed Oct 30 02:53:15
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt Fri Nov 15 09:26:33
+2002
@@ -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) */
Index: php4/ext/mbstring/tests/mb_ereg_replace.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace.phpt:1.2
php4/ext/mbstring/tests/mb_ereg_replace.phpt:1.3
--- php4/ext/mbstring/tests/mb_ereg_replace.phpt:1.2 Wed Oct 30 03:06:52 2002
+++ php4/ext/mbstring/tests/mb_ereg_replace.phpt Fri Nov 15 09:26:33 2002
@@ -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( '' );
Index: php4/ext/mbstring/tests/mb_split-compat-01.phpt
diff -u php4/ext/mbstring/tests/mb_split-compat-01.phpt:1.2
php4/ext/mbstring/tests/mb_split-compat-01.phpt:1.3
--- php4/ext/mbstring/tests/mb_split-compat-01.phpt:1.2 Wed Oct 30 02:53:15 2002
+++ php4/ext/mbstring/tests/mb_split-compat-01.phpt Fri Nov 15 09:26:33 2002
@@ -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) */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
