Clean up.

23 years ago · a705a8b597
26 changed files with 38 additions and 74 deletions
--- 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','.');
--- 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' );
--- 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
--- 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
--- 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
--- 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
--- 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;
--- 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( '' );
--- 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( '' );
--- 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( '' );
--- 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--
--- 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.
--- 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: 
--- 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
--- 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
--- 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' );
--- 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( '' );
--- 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
--- 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
--- 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
--- 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
--- 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.....
--- 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;
--- 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
--- 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<>";
--- 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
 /*