Added skip conditions in the event the required charset is not avaliabled.

Removed old (commented out) module loading code.

diff --git a/ext/standard/tests/strings/htmlentities05.phpt b/ext/standard/tests/strings/htmlentities05.phpt
index 341bb0ae2124a491c912399a711161f65650c84c..779cf289b0b1d02b6f1e6227a3cec170a4405500 100644 (file)
--- a/ext/standard/tests/strings/htmlentities05.phpt
+++ b/ext/standard/tests/strings/htmlentities05.phpt
@@ -4,22 +4,16 @@ htmlentities() test 5 (mbstring / cp1252)
 output_handler=
 --SKIPIF--
 <?php
-/*
-if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-       @dl("mbstring$dlext");
-}
-*/
-extension_loaded("mbstring") or die("skip mbstring not available\n");
+       extension_loaded("mbstring") or die("skip mbstring not available\n");
+       mb_internal_encoding('cp1252');
+       $php_errormsg = NULL;
+       @htmlentities("\x82\x86\x99\x9f", ENT_QUOTES, '');
+       if ($php_errormsg) {
+               die("skip cp1252 chracter set is not supported on this platform.\n");
+       }
 ?>
 --FILE--
 <?php
-/*
-       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-               @dl("mbstring$dlext");
-       }
-*/
        mb_internal_encoding('cp1252');
        print mb_internal_encoding()."\n";
        var_dump(htmlentities("\x82\x86\x99\x9f", ENT_QUOTES, ''));

diff --git a/ext/standard/tests/strings/htmlentities06.phpt b/ext/standard/tests/strings/htmlentities06.phpt
index e7bf55b2e6f5a8cec078c0de6e1197a098a050c1..647d7ecc63ad997ae0cbc595a058d9e539f7fa9c 100644 (file)
--- a/ext/standard/tests/strings/htmlentities06.phpt
+++ b/ext/standard/tests/strings/htmlentities06.phpt
@@ -4,22 +4,15 @@ htmlentities() test 6 (mbstring / ISO-8859-15)
 output_handler=
 --SKIPIF--
 <?php
-/*
-if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-       @dl("mbstring$dlext");
-}
-*/
-extension_loaded("mbstring") or die("skip mbstring not available\n");
+       extension_loaded("mbstring") or die("skip mbstring not available\n");
+       mb_internal_encoding('ISO-8859-15');
+       @htmlentities("\xbc\xbd\xbe", ENT_QUOTES, '');
+       if ($php_errormsg) {
+               die("skip ISO-8859-15 chracter set is not supported on this platform.\n");
+       }
 ?>
 --FILE--
 <?php
-/*
-       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-               @dl("mbstring$dlext");
-       }
-*/
        mb_internal_encoding('ISO-8859-15');
        print mb_internal_encoding()."\n";
        var_dump(htmlentities("\xbc\xbd\xbe", ENT_QUOTES, ''));

diff --git a/ext/standard/tests/strings/htmlentities07.phpt b/ext/standard/tests/strings/htmlentities07.phpt
index f2308992b64bef3b84457d564ab808863d2a59e3..efd06f08ad0f020832dd701ccb09a29448297451 100644 (file)
--- a/ext/standard/tests/strings/htmlentities07.phpt
+++ b/ext/standard/tests/strings/htmlentities07.phpt
@@ -4,22 +4,16 @@ htmlentities() test 7 (mbstring / ISO-8859-1)
 output_handler=
 --SKIPIF--
 <?php
-/*
-if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-       @dl("mbstring$dlext");
-}
-*/
-extension_loaded("mbstring") or die("skip mbstring not available\n");
+       extension_loaded("mbstring") or die("skip mbstring not available\n");
+       mb_internal_encoding('ISO-8859-1');
+       $php_errormsg = NULL;
+       @htmlentities("\xe4\xf6\xfc", ENT_QUOTES, '');
+       if ($php_errormsg) {
+               die("skip ISO-8859-1 chracter set is not supported on this platform.\n");
+       }
 ?>
 --FILE--
 <?php
-/*
-       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-               @dl("mbstring$dlext");
-       }
-*/
        mb_internal_encoding('ISO-8859-1');
        print mb_internal_encoding()."\n";
        var_dump(htmlentities("\xe4\xf6\xfc", ENT_QUOTES, ''));

diff --git a/ext/standard/tests/strings/htmlentities08.phpt b/ext/standard/tests/strings/htmlentities08.phpt
index dd256de83877884b81a234c2602e7f16c27b18a0..0f8f912f272f97226329497187ab92138e023fce 100644 (file)
--- a/ext/standard/tests/strings/htmlentities08.phpt
+++ b/ext/standard/tests/strings/htmlentities08.phpt
@@ -4,22 +4,16 @@ htmlentities() test 8 (mbstring / EUC-JP)
 output_handler=
 --SKIPIF--
 <?php
-/*
-if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-       @dl("mbstring$dlext");
-}
-*/
-extension_loaded("mbstring") or die("skip mbstring not available\n");
+       extension_loaded("mbstring") or die("skip mbstring not available\n");
+       mb_internal_encoding('EUC-JP');
+       $php_errormsg = NULL;
+       @htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, '');
+       if ($php_errormsg) {
+               die("skip EUC-JP chracter set is not supported on this platform.\n");   
+       }
 ?>
 --FILE--
 <?php
-/*
-       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-               @dl("mbstring$dlext");
-       }
-*/
        mb_internal_encoding('EUC-JP');
        print mb_internal_encoding()."\n";
        var_dump(htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, ''));

diff --git a/ext/standard/tests/strings/htmlentities09.phpt b/ext/standard/tests/strings/htmlentities09.phpt
index bafdf66e8caa3a65fc56d0c09f231f8f3ed42517..4c6ef60c740ec8efec6a7a1cfe2e4eb9386fa4e7 100644 (file)
--- a/ext/standard/tests/strings/htmlentities09.phpt
+++ b/ext/standard/tests/strings/htmlentities09.phpt
@@ -4,22 +4,16 @@ htmlentities() test 9 (mbstring / Shift_JIS)
 output_handler=
 --SKIPIF--
 <?php
-/*
-if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-       @dl("mbstring$dlext");
-}
-*/
-extension_loaded("mbstring") or die("skip mbstring not available\n");
+       extension_loaded("mbstring") or die("skip mbstring not available\n");
+       mb_internal_encoding('Shift_JIS');
+       $php_errormsg = NULL;
+       @htmlentities("\x81\x41\x81\x42\x81\x43", ENT_QUOTES, '');
+       if ($php_errormsg) {
+               die("skip Shift_JIS chracter set is not supported on this platform.\n");
+       }
 ?>
 --FILE--
 <?php
-/*
-       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
-               @dl("mbstring$dlext");
-       }
-*/
        mb_internal_encoding('Shift_JIS');
        print mb_internal_encoding()."\n";
        var_dump(htmlentities("\x81\x41\x81\x42\x81\x43", ENT_QUOTES, ''));