Clean up.

diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt
index 97b83f23cfffaf21170cb42df604c0b1ce58b39e..efae733ca2440e93ebcf932f57fba0a983d9c9e3 100644 (file)
--- a/ext/mbstring/tests/bug20087.phpt
+++ b/ext/mbstring/tests/bug20087.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #20087 (Assertion failure)
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 ini_set('include_path','.');

diff --git a/ext/mbstring/tests/casefold.phpt b/ext/mbstring/tests/casefold.phpt
index 821b957af9e30db4817ace67a63f47ad57aa2b61..d0b96a9fb188b3aec8d033a8395ede0a11cbbaa1 100644 (file)
--- a/ext/mbstring/tests/casefold.phpt
+++ b/ext/mbstring/tests/casefold.phpt
@@ -1,11 +1,11 @@
 --TEST--
 mb_strtoupper() / mb_strtolower() 
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
 function_exists('mb_strtolower') and
 function_exists('mb_convert_case' ) or die("SKIP");
---POST--
---GET--
+?>
 --FILE--
 <?php
        mb_internal_encoding( 'ISO-8859-1' );

diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt
index 7253ce43504b4da458ce3ef9aaf941dff7266ce0..ca7d64ba4148858926164ae9bee0b06675aebe2d 100644 (file)
--- a/ext/mbstring/tests/htmlent.phpt
+++ b/ext/mbstring/tests/htmlent.phpt
@@ -3,7 +3,7 @@ HTML input/output
 --SKIPIF--
 <?php 
        ini_set('include_path','.'); 
-       include('skipif.inc'); 
+       extension_loaded('mbstring') or die('skip mbstring not available'); 
 ?>
 --INI--
 output_handler=mb_output_handler

diff --git a/ext/mbstring/tests/mb_convert_encoding.phpt b/ext/mbstring/tests/mb_convert_encoding.phpt
index 6779e14ad5584f214f2a1716be79d21446ef224d..170512b6d219cf4bcb119d7a52cdcaaf2a0576cd 100644 (file)
--- a/ext/mbstring/tests/mb_convert_encoding.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_convert_encoding()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more tests

diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt
index a77243ff864b82819c0330f2ffa9b5b0ef71283e..73982d0426d507051e0e17d835298c6e3870e6b6 100644 (file)
--- a/ext/mbstring/tests/mb_convert_variables.phpt
+++ b/ext/mbstring/tests/mb_convert_variables.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_convert_variables()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more tests

diff --git a/ext/mbstring/tests/mb_detect_encoding.phpt b/ext/mbstring/tests/mb_detect_encoding.phpt
index f05844a838d95f9db9ab1d4131d4ac51a323763b..5031f6fb8fc39f814e5e11a8f34ee769fded5072 100644 (file)
--- a/ext/mbstring/tests/mb_detect_encoding.phpt
+++ b/ext/mbstring/tests/mb_detect_encoding.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_detect_encoding()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more tests

diff --git a/ext/mbstring/tests/mb_detect_order.phpt b/ext/mbstring/tests/mb_detect_order.phpt
index a84849f2fb953e8875f373e92fa25cfb10c73f2a..3a76b4d0ede32d575d46e156137a2426d1b1d072 100644 (file)
--- a/ext/mbstring/tests/mb_detect_order.phpt
+++ b/ext/mbstring/tests/mb_detect_order.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_detect_order()  
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 //$debug = true;

diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt
index 2fe791f371038b06073235fba1e8e5be98a3e4f6..240331b7203e8ee98cb50fba0f52ed39848eba76 100644 (file)
--- a/ext/mbstring/tests/mb_ereg.phpt
+++ b/ext/mbstring/tests/mb_ereg.phpt
@@ -1,10 +1,10 @@
 --TEST--
 mb_ereg()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
 function_exists('mb_ereg') or die("SKIP");
---POST--
---GET--
+?>
 --FILE--
 <?php
        mb_regex_set_options( '' );

diff --git a/ext/mbstring/tests/mb_ereg_replace.phpt b/ext/mbstring/tests/mb_ereg_replace.phpt
index da7f0336c661cd06a974d9c1aefed71aa60fa803..6052e9f8520c25257698f52a793d450430c4ffdd 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_replace.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace.phpt
@@ -1,10 +1,8 @@
 --TEST--
 mb_ereg_replace()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 function_exists('mb_ereg_replace') or die("SKIP");
---POST--
---GET--
 --FILE--
 <?php
        mb_regex_set_options( '' );

diff --git a/ext/mbstring/tests/mb_ereg_search_xxx.phpt b/ext/mbstring/tests/mb_ereg_search_xxx.phpt
index 98b42c3b258d49ab10ce6e101acb175c5a49d3a8..eba07eeb11da7c6da237bf5b420e824fc6e3cb1f 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_search_xxx.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_xxx.phpt
@@ -1,10 +1,10 @@
 --TEST--
 mb_ereg_search() stuff
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
 function_exists('mb_ereg_search') or die("SKIP");
---POST--
---GET--
+?>
 --FILE--
 <?php
        mb_regex_set_options( '' );

diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt
index 642c514bf7ed5e1dd1523cc11bdf1180489b45a0..a27de9f873f058f6f649ed298ea04b76e5870763 100644 (file)
--- a/ext/mbstring/tests/mb_http_input.phpt
+++ b/ext/mbstring/tests/mb_http_input.phpt
@@ -2,7 +2,7 @@
 mb_http_input() 
 --SKIPIF--
 <?php
-include('skipif.inc');
+extension_loaded('mbstring') or die('skip mbstring not available');
 (php_sapi_name()=='cgi') or die("skip sapi is not a cgi version");
 ?>
 --POST--

diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt
index 237947a70c702462c5251e39f52db545aa82daae..1e5d4ceb71600bda0ed0bc8e37c0b9c0ef4a2de0 100644 (file)
--- a/ext/mbstring/tests/mb_http_output.phpt
+++ b/ext/mbstring/tests/mb_http_output.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_http_output()  
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 //TODO: Add more encoding. Wrong paramter type test.

diff --git a/ext/mbstring/tests/mb_internal_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding.phpt
index 647025fe8af1cd9d5291c7d7effb20f906e5964a..28122707c8cd59f62ce2d9c3a553a0a7e3900b27 100644 (file)
--- a/ext/mbstring/tests/mb_internal_encoding.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_internal_encoding()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: 

diff --git a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
index eb09a11ae79027a11536f7d7ce9669fe43fec19b..dff5c97743776eb759f77c97aef4acfc54d692ab 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
+++ b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_output_handler() (EUC-JP)
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Do real test

diff --git a/ext/mbstring/tests/mb_preferred_mime_name.phpt b/ext/mbstring/tests/mb_preferred_mime_name.phpt
index 7bb05cb7c89b519290993b999d5273b7c94b5367..82f88b15c3c54a4690a89c2aa3177ec807d77665 100644 (file)
--- a/ext/mbstring/tests/mb_preferred_mime_name.phpt
+++ b/ext/mbstring/tests/mb_preferred_mime_name.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_preferred_mime_name()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more encoding names

diff --git a/ext/mbstring/tests/mb_regex_set_options.phpt b/ext/mbstring/tests/mb_regex_set_options.phpt
index ec1f3910e2ccead1a4275adb78c44ed71ab549f3..97021f51d36635367c201ac4e6707c93a1ddb975 100644 (file)
--- a/ext/mbstring/tests/mb_regex_set_options.phpt
+++ b/ext/mbstring/tests/mb_regex_set_options.phpt
@@ -1,10 +1,10 @@
 --TEST--
 mb_regex_set_options() 
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
 function_exists('mb_regex_set_options') or die("SKIP");
---POST--
---GET--
+?>
 --FILE--
 <?php
        mb_regex_set_options( 'x' );

diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt
index 4ffcdeb1093cd7156cf68739eeb2bec71b572964..00a143288a2156a9908237337b74bd5d9d8ed986 100644 (file)
--- a/ext/mbstring/tests/mb_split.phpt
+++ b/ext/mbstring/tests/mb_split.phpt
@@ -1,10 +1,10 @@
 --TEST--
 mb_split()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
 function_exists('mb_split') or die("SKIP");
---POST--
---GET--
+?>
 --FILE--
 <?php
        mb_regex_set_options( '' );

diff --git a/ext/mbstring/tests/mb_strcut.phpt b/ext/mbstring/tests/mb_strcut.phpt
index 5afc67dab605555f38b9c2e625b73974bf1b86e7..a857d59a71ece1cf3e05f69b2a7bbb10a86ba940 100644 (file)
--- a/ext/mbstring/tests/mb_strcut.phpt
+++ b/ext/mbstring/tests/mb_strcut.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_strcut()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more encodings

diff --git a/ext/mbstring/tests/mb_strimwidth.phpt b/ext/mbstring/tests/mb_strimwidth.phpt
index 61afe243b04984e9904c06b3c976c0795da1e21c..151f0758854c17003e87e4b23a1e2d38aa11c71c 100644 (file)
--- a/ext/mbstring/tests/mb_strimwidth.phpt
+++ b/ext/mbstring/tests/mb_strimwidth.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_strimwidth()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more encoding

diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt
index 5ce999ac7d3402996d31e6bc367f167fd1591aaf..500237e2cceeb5a1c344a73d362000d65db0942a 100644 (file)
--- a/ext/mbstring/tests/mb_strlen.phpt
+++ b/ext/mbstring/tests/mb_strlen.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_strlen()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more encodings

diff --git a/ext/mbstring/tests/mb_strpos.phpt b/ext/mbstring/tests/mb_strpos.phpt
index 99a2751f0a5fb58f85a20be4b53475a9e980caeb..6fce17c95f8bb869f321f938d3acb8ee518c2092 100644 (file)
--- a/ext/mbstring/tests/mb_strpos.phpt
+++ b/ext/mbstring/tests/mb_strpos.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_strpos() 
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more encodings

diff --git a/ext/mbstring/tests/mb_strwidth.phpt b/ext/mbstring/tests/mb_strwidth.phpt
index 5d8aa62b473795be9d9cb099cf46ec1a82705ec9..33ec851c3da9bbed67966fb6dd23732fc3a4b9f3 100644 (file)
--- a/ext/mbstring/tests/mb_strwidth.phpt
+++ b/ext/mbstring/tests/mb_strwidth.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_strwidth()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more encoding, strings.....

diff --git a/ext/mbstring/tests/mb_substitute_character.phpt b/ext/mbstring/tests/mb_substitute_character.phpt
index 14f6eee135802cd23e44720d8a7fa7c0091c8628..9f2131080ede382be2f0233bd07ae48d8a172678 100644 (file)
--- a/ext/mbstring/tests/mb_substitute_character.phpt
+++ b/ext/mbstring/tests/mb_substitute_character.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_substitute_character()  
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 //$debug = true;

diff --git a/ext/mbstring/tests/mb_substr.phpt b/ext/mbstring/tests/mb_substr.phpt
index 8a45b22be04e52f53cd826c2efc5a3bd48be3aaf..2bfef5fec9f226db7d3c715675d03fd9cee8d76f 100644 (file)
--- a/ext/mbstring/tests/mb_substr.phpt
+++ b/ext/mbstring/tests/mb_substr.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mb_substr()
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 // TODO: Add more encodings

diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt
index bf94de0c58faed6ce5424160c713ca109c457691..664d58ccc68931842a91bdca3ca4fe73d4a13de2 100644 (file)
--- a/ext/mbstring/tests/php_gr_jp_10830.phpt
+++ b/ext/mbstring/tests/php_gr_jp_10830.phpt
@@ -1,10 +1,10 @@
 --TEST--
 php-users@php.gr.jp #10830 
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
 function_exists('mb_ereg') or die("SKIP");
---POST--
---GET--
+?>
 --FILE--
 <?php
 $a="aaa\n<>";

diff --git a/ext/mbstring/tests/simpletest.phpt b/ext/mbstring/tests/simpletest.phpt
index 1eb68a3d4d00b8a9f152196069d8b7a8e78940b1..3360325214cce0705792c3e68c95dc341dcee4f5 100644 (file)
--- a/ext/mbstring/tests/simpletest.phpt
+++ b/ext/mbstring/tests/simpletest.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Simple multi-byte print test (EUC-JP)
 --SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 /*