diff options
26 files changed, 38 insertions, 74 deletions
diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt index 97b83f23cf..efae733ca2 100644 --- 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 821b957af9..d0b96a9fb1 100644 --- 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 7253ce4350..ca7d64ba41 100644 --- 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 6779e14ad5..170512b6d2 100644 --- 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 a77243ff86..73982d0426 100644 --- 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 f05844a838..5031f6fb8f 100644 --- 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 a84849f2fb..3a76b4d0ed 100644 --- 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 2fe791f371..240331b720 100644 --- 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 da7f0336c6..6052e9f852 100644 --- 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 98b42c3b25..eba07eeb11 100644 --- 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 642c514bf7..a27de9f873 100644 --- 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 237947a70c..1e5d4ceb71 100644 --- 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 647025fe8a..28122707c8 100644 --- 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 eb09a11ae7..dff5c97743 100644 --- 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 7bb05cb7c8..82f88b15c3 100644 --- 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 ec1f3910e2..97021f51d3 100644 --- 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 4ffcdeb109..00a143288a 100644 --- 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 5afc67dab6..a857d59a71 100644 --- 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 61afe243b0..151f075885 100644 --- 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 5ce999ac7d..500237e2cc 100644 --- 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 99a2751f0a..6fce17c95f 100644 --- 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 5d8aa62b47..33ec851c3d 100644 --- 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 14f6eee135..9f2131080e 100644 --- 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 8a45b22be0..2bfef5fec9 100644 --- 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 bf94de0c58..664d58ccc6 100644 --- 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 1eb68a3d4d..3360325214 100644 --- 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 /* |