Removed dl() stuff

diff --git a/ext/iconv/tests/bug16069.phpt b/ext/iconv/tests/bug16069.phpt
index af27e1ed4099d1c0749e4674ca057a3dfa4d29f4..0d58defe3cc6f214ed049b052153ad884e4bb6b6 100644 (file)
--- a/ext/iconv/tests/bug16069.phpt
+++ b/ext/iconv/tests/bug16069.phpt
@@ -2,7 +2,7 @@
 Bug #16069
 --SKIPIF--
 <?php
-include( 'skipif.inc' );
+/* include( 'skipif.inc' ); */
 if (@iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d")=='') {
        die("skip  CP932 translit not available\n");
 }
@@ -11,7 +11,7 @@ if (@iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d")=='') {
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /* charset=CP932, KOI8-R */
 $str = "\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d";
 print iconv( "CP932", "EUC-JP//TRANSLIT", $str );

diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index ae275fe1db4ee1c8ec78821ca0cb2840b6015f5a..b0177af8174c77b5f378d60fdaf5854ab6ca7237 100644 (file)
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@ -1,12 +1,12 @@
 --TEST--
 EUC-JP to ISO-2022-JP
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /* charset=EUC-JP */
 
 $str = "

diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index 90d791a791611c7906a147ea88320a806effe34c..c1cac62e8549e6d17250da87a5a9ae4871816326 100644 (file)
--- a/ext/iconv/tests/eucjp2sjis.phpt
+++ b/ext/iconv/tests/eucjp2sjis.phpt
@@ -1,12 +1,12 @@
 --TEST--
 EUC-JP to SJIS
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /* charset=EUC-JP */
 
 $str = "

diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 00fa454572c13a706ee7530af1e27a9d401ef7e6..2100385cd6015b04d939807d60b174aa4badede0 100644 (file)
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -1,12 +1,12 @@
 --TEST--
 EUC-JP to UTF8
 --SKIPIF--
-<?php include('skipif.inc');?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /* charset=EUC-JP */
 
 $str = "

diff --git a/ext/iconv/tests/iconv001.phpt b/ext/iconv/tests/iconv001.phpt
index ae0329397b250fea87bb68b1b41cb0b6b49c78b5..2fa0158feccc0ca58ff0ce9876100c453622d194 100644 (file)
--- a/ext/iconv/tests/iconv001.phpt
+++ b/ext/iconv/tests/iconv001.phpt
@@ -1,12 +1,12 @@
 --TEST--
 iconv test
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 echo "iconv extension is available\n";
 $test = "æøå";
 var_dump("ISO-8859-1: $test");

diff --git a/ext/iconv/tests/iconv002.phpt b/ext/iconv/tests/iconv002.phpt
index f5015800bcc8234ff1b627c1143131120415aba1..834fb4bb05eda12cb328e567dced7345d14cc782 100644 (file)
--- a/ext/iconv/tests/iconv002.phpt
+++ b/ext/iconv/tests/iconv002.phpt
@@ -1,12 +1,12 @@
 --TEST--
 UCS4BE to ASCII
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /*
 Expected output:
 &#97;&#98;&#99;&#100;

diff --git a/ext/iconv/tests/ob_iconv_handler.phpt b/ext/iconv/tests/ob_iconv_handler.phpt
index 4055e95ea685736c06e25ae02ad8ad123a125715..0b8797521a4de3b909e3861193ad9d6e0a970142 100644 (file)
--- a/ext/iconv/tests/ob_iconv_handler.phpt
+++ b/ext/iconv/tests/ob_iconv_handler.phpt
@@ -1,12 +1,12 @@
 --TEST--
 ob_output_handler
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 iconv_set_encoding('internal_encoding', 'EUC-JP');
 iconv_set_encoding('output_encoding', 'Shift_JIS');
 ob_start('ob_iconv_handler');

diff --git a/ext/iconv/tests/translit-failure.phpt b/ext/iconv/tests/translit-failure.phpt
index ef3f5f059af51e36ca289408a388e9f6dd8fa07d..d0fbf5c86add6052e5033fbdd239bb98aae4334b 100644 (file)
--- a/ext/iconv/tests/translit-failure.phpt
+++ b/ext/iconv/tests/translit-failure.phpt
@@ -2,14 +2,14 @@
 Translit failure
 --SKIPIF--
 <?php
-include('skipif.inc');
+/* include('skipif.inc'); */
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 // Should be ok.
 // Content from file is from libiconv testkit. Tested both
 // with a string as an implode, no difference.

diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt
index fd6452bf96e32997e687dd25cbc9f5f434e26251..dc73981f9b70803fe913f2eee51c1904982587a9 100644 (file)
--- a/ext/iconv/tests/translit-utf8.phpt
+++ b/ext/iconv/tests/translit-utf8.phpt
@@ -2,14 +2,14 @@
 Translit UTF-8 quotes
 --SKIPIF--
 <?php
-include('skipif.inc');
+/* include('skipif.inc'); */
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
 --INI--
 error_reporting=2047
 --FILE--
 <?php // vim600: syn=php
-include('test.inc');
+/* include('test.inc'); */
 //error_reporting(E_ALL);
 $utf = implode('', file('ext/iconv/tests/Quotes.UTF-8'));
 

diff --git a/ext/standard/tests/strings/htmlentities05.phpt b/ext/standard/tests/strings/htmlentities05.phpt
index ac93c1b2e843ff1618997367dd36f2ebd09e4c53..341bb0ae2124a491c912399a711161f65650c84c 100644 (file)
--- a/ext/standard/tests/strings/htmlentities05.phpt
+++ b/ext/standard/tests/strings/htmlentities05.phpt
@@ -4,18 +4,22 @@ 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");
 ?>
 --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 de698b238332aba2b53214c0c85e8b481d266749..e7bf55b2e6f5a8cec078c0de6e1197a098a050c1 100644 (file)
--- a/ext/standard/tests/strings/htmlentities06.phpt
+++ b/ext/standard/tests/strings/htmlentities06.phpt
@@ -4,18 +4,22 @@ 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");
 ?>
 --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 4b4be0e5df53fc41eb3a27519a874e235c459f19..f2308992b64bef3b84457d564ab808863d2a59e3 100644 (file)
--- a/ext/standard/tests/strings/htmlentities07.phpt
+++ b/ext/standard/tests/strings/htmlentities07.phpt
@@ -4,18 +4,22 @@ 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");
 ?>
 --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 c0fe54997fffb36ce4a2f3593ec4886ffd72db2f..dd256de83877884b81a234c2602e7f16c27b18a0 100644 (file)
--- a/ext/standard/tests/strings/htmlentities08.phpt
+++ b/ext/standard/tests/strings/htmlentities08.phpt
@@ -4,18 +4,22 @@ 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");
 ?>
 --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 17dc5cca1a7b22f081d764e288811d4159d0b0ba..bafdf66e8caa3a65fc56d0c09f231f8f3ed42517 100644 (file)
--- a/ext/standard/tests/strings/htmlentities09.phpt
+++ b/ext/standard/tests/strings/htmlentities09.phpt
@@ -4,18 +4,22 @@ 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");
 ?>
 --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, ''));