Shortened comments. I also think they were too long.

diff --git a/ext/mbstring/tests/mb_ereg-compat-01.phpt b/ext/mbstring/tests/mb_ereg-compat-01.phpt
index 19f1beab52dbaf59727d6dd248911c42b009182f..a5a195e7eb324c2db9b008b923197f07e14d05e5 100644 (file)
--- a/ext/mbstring/tests/mb_ereg-compat-01.phpt
+++ b/ext/mbstring/tests/mb_ereg-compat-01.phpt
@@ -1,9 +1,11 @@
 --TEST--
-mb_ereg() compatibility test 1 (counterpart: ext/standard/tests/reg/004.phpt)
---POST--
---GET--
+mb_ereg() compat test 1
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="This is a nice and simple string";
+<?php
+/* (counterpart: ext/standard/tests/reg/004.phpt) */
+  $a="This is a nice and simple string";
   if (mb_ereg(".*nice and simple.*",$a)) {
     echo "ok\n";
   }

diff --git a/ext/mbstring/tests/mb_ereg-compat-02.phpt b/ext/mbstring/tests/mb_ereg-compat-02.phpt
index 2ce83120f4b0e3b83d9851259a4ba47c180a8a70..d7957d6a93b416efc7220789e91f2d5fe00ed7a9 100644 (file)
--- a/ext/mbstring/tests/mb_ereg-compat-02.phpt
+++ b/ext/mbstring/tests/mb_ereg-compat-02.phpt
@@ -1,9 +1,11 @@
 --TEST--
-mb_ereg() compatibility test 2 (counterpart: ext/standard/tests/reg/005.phpt)
---POST--
---GET--
+mb_ereg() compat test 2
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="This is a nice and simple string";
+<?php
+/* (counterpart: ext/standard/tests/reg/005.phpt) */
+  $a="This is a nice and simple string";
   echo mb_ereg(".*(is).*(is).*",$a,$registers);
   echo "\n";
   echo $registers[0];

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
index 48bd604ceb5fb2ef2ef4404e3aa98d0b2663b9ba..b1e0913e466ce6ac3146bb45927d2060ad6425bd 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
@@ -1,9 +1,12 @@
 --TEST--
-mb_ereg_replace() compatibility test 1 (counterpart: ext/standard/tests/reg/001.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 1
+--SKIPIF--
+extension_loaded('mbstring') or die('skip'); 
 --FILE--
-<?php $a="abc123";
-  echo mb_ereg_replace("123","def",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/001.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123","def",$a);
+?>
 --EXPECT--
 abcdef

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
index 92cf17b6b84bd6820eec78eeb340971d084d7b64..f428c768c0958915f42a610b129dfac617a3b90d 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
@@ -1,9 +1,12 @@
 --TEST--
-mb_ereg_replace() compatibility test 2 (counterpart: ext/standard/tests/reg/002.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 2
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="abc123";
-  echo mb_ereg_replace("123","",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/002.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123","",$a);
+?>
 --EXPECT--
 abc

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
index 3b5b2cca195036d9284fdfb427114b109494bcde..8c8a1699e1b9844fa119a033811aa09b46b3ace8 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
@@ -1,10 +1,12 @@
 --TEST--
-mb_ereg_replace() compatibility test 3 (counterpart: ext/standard/tests/reg/003.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 3
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="\\'test";
-  echo mb_ereg_replace("\\\\'","'",$a)
+<?php
+/* (counterpart: ext/standard/tests/reg/003.phpt) */
+  $a="\\'test";
+  echo mb_ereg_replace("\\\\'","'",$a);
 ?>
 --EXPECT--
 'test

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
index cf3aee53d8b6b02542d3b28c46d92a87f48f287e..d56965994eceeed092821c2acbcb6990c5f38ed9 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
@@ -1,9 +1,11 @@
 --TEST--
-mb_ereg_replace() compatibility test 4 (counterpart: ext/standard/tests/reg/006.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 4
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="This is a nice and simple string";
+<?php
+/* (counterpart: ext/standard/tests/reg/006.phpt) */
+  $a="This is a nice and simple string";
   echo mb_ereg_replace("^This","That",$a);
 ?>
 --EXPECT--

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
index d3deb616fcddaa50d880a894c2da75fcdf912b64..62837d9651a954a537be972c80062e9cc213a80a 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
@@ -1,12 +1,13 @@
 --TEST--
-mb_ereg_replace() compatibility test 5 (counterpart: ext/standard/tests/reg/007.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 5
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
 <?php 
-       $a="abcd";
-       $b=mb_ereg_replace("abcd","",$a);
-       echo "strlen(\$b)=".strlen($b);
+/* (counterpart: ext/standard/tests/reg/007.phpt) */
+  $a="abcd";
+  $b=mb_ereg_replace("abcd","",$a);
+  echo "strlen(\$b)=".strlen($b);
 ?>
 --EXPECT--
 strlen($b)=0

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
index 6a300fb6d550e458652bbd1ce8961c3de10f89d8..80571b2d5b34049eb90cd699ed51da68aac4dc25 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
@@ -1,10 +1,11 @@
 --TEST--
-mb_ereg_replace() compatibility test 6 (counterpart: ext/standard/tests/reg/008.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 6
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
 <?php
-       echo mb_ereg_replace("([a-z]*)([-=+|]*)([0-9]+)","\\3 \\1 \\2\n","abc+-|=123");
+/* (counterpart: ext/standard/tests/reg/008.phpt) */
+  echo mb_ereg_replace("([a-z]*)([-=+|]*)([0-9]+)","\\3 \\1 \\2\n","abc+-|=123");
 ?>
 --EXPECT--
 123 abc +-|=

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
index e86a8b785f20d45212e6d506180a76c42d8361fe..7e717c6ff6a114466fa26b951144e5ce623b6da0 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
@@ -1,9 +1,12 @@
 --TEST--
-mb_ereg_replace() compatibility test 7 (counterpart: ext/standard/tests/reg/010.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 7
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="abc122222222223";
-  echo mb_ereg_replace("1(2*)3","\\1def\\1",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/010.phpt) */
+  $a="abc122222222223";
+  echo mb_ereg_replace("1(2*)3","\\1def\\1",$a);
+?>
 --EXPECT--
 abc2222222222def2222222222

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
index 2b22fe257bb8c13dcdd376113397887b5a5160b0..711bdf7f4eac0ebe3bdd5a637e80c3a91438a2e6 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
@@ -1,9 +1,12 @@
 --TEST--
-mb_ereg_replace() compatibility test 8 (counterpart: ext/standard/tests/reg/011.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 8
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="abc123";
-  echo mb_ereg_replace("123","def\\0ghi",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/011.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123","def\\0ghi",$a);
+?>
 --EXPECT--
 abcdef123ghi

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
index 7af20ad526c5fd277e67885bafd909e091c605d6..9133ae913a62defd72c829f9c1f89982bf17160f 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
@@ -1,9 +1,12 @@
 --TEST--
-mb_ereg_replace() compatibility test 9 (counterpart: ext/standard/tests/reg/012.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 9
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="abc123";
-  echo mb_ereg_replace("123",'def\1ghi',$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/012.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123",'def\1ghi',$a);
+?>
 --EXPECT--
 abcdef\1ghi

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
index a35c4b00e1baa250e546e717ef486aaa717b291b..b3114c4f909cec88661ea6201451571fd24cd76c 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
@@ -1,9 +1,12 @@
 --TEST--
-mb_ereg_replace() compatibility test 10 (counterpart: ext/standard/tests/reg/013.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 10
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="abc123";
-  echo mb_ereg_replace("123","def\\g\\\\hi\\",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/013.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123","def\\g\\\\hi\\",$a);
+?>
 --EXPECT--
 abcdef\g\\hi\

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
index 59ec9d27e083fc8932dbaa9d169705b92be2a3c0..93ee53f04d038aed55eece9d9177734a069b48f1 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
@@ -1,9 +1,12 @@
 --TEST--
-mb_ereg_replace() compatibility test 11 (counterpart: ext/standard/tests/reg/014.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 11
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php $a="a\\2bxc";
-  echo mb_ereg_replace("a(.*)b(.*)c","\\1",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/014.phpt) */
+  $a="a\\2bxc";
+  echo mb_ereg_replace("a(.*)b(.*)c","\\1",$a);
+?>
 --EXPECT--
 \2

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
index 66ca1c4ba75d89b3cc6da6acea28e2c51efee874..e4dcfdc214a194e5050e5c27e8af561224d91052 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
@@ -1,8 +1,11 @@
 --TEST--
-mb_ereg_replace() compatibility test 12 (counterpart: ext/standard/tests/reg/015.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 12
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php echo mb_ereg_replace("^","z","abc123")?>
+<?php
+/* (counterpart: ext/standard/tests/reg/015.phpt) */
+  echo mb_ereg_replace("^","z","abc123");
+?>
 --EXPECT--
 zabc123

diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
index a920db55ee5e411b47c8ce4bd643ba25a0334cbf..79f231d864fd564e7ec8cfdb3c29e73fe0bef30c 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
@@ -1,8 +1,11 @@
 --TEST--
-mb_ereg_replace() compatibility test 13 (counterpart: ext/standard/tests/reg/016.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 13
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
-<?php echo mb_ereg_replace('\?',"abc","?123?")?>
+<?php
+/* (counterpart: ext/standard/tests/reg/016.phpt) */
+  echo mb_ereg_replace('\?',"abc","?123?");
+?>
 --EXPECT--
 abc123abc

diff --git a/ext/mbstring/tests/mb_split-compat-01.phpt b/ext/mbstring/tests/mb_split-compat-01.phpt
index 35ff1369267a895187948ee2581f773dd7bc6f80..8118278c6da8d611fee58bae4fefcbba40264ef8 100644 (file)
--- a/ext/mbstring/tests/mb_split-compat-01.phpt
+++ b/ext/mbstring/tests/mb_split-compat-01.phpt
@@ -1,9 +1,10 @@
 --TEST--
-mb_split() compatibility test 1 (counterpart: ext/standard/tests/reg/009.phpt)
---POST--
---GET--
+mb_split() compat test 1
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
 --FILE--
 <?php
+/* (counterpart: ext/standard/tests/reg/009.phpt) */
        $a=mb_split("[[:space:]]","this is      a
 test");
        echo count($a) . "\n";