cvs -z3 -q diff skipif.inc test.inc (in directory S:\php4-HEAD\ext\iconv\tests\)
Index: skipif.inc
===================================================================
RCS file: /repository/php4/ext/iconv/tests/skipif.inc,v
retrieving revision 1.2
diff -u -r1.2 skipif.inc
--- skipif.inc 28 Oct 2002 17:15:21 -0000 1.2
+++ skipif.inc 28 Oct 2002 18:35:25 -0000
@@ -1,10 +1,11 @@
<?php
// This script prints "skip" if condition does not meet.
-if (!extension_loaded("iconv") && ini_get("enable_dl")) {
- $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
- @dl("iconv$dlext");
-}
+// Do not dl load extension
+//if (!extension_loaded("iconv") && ini_get("enable_dl")) {
+// $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
+// @dl("iconv$dlext");
+//}
if (!extension_loaded("iconv")) {
die("skip iconv extension not available\n");
}
Index: test.inc
===================================================================
RCS file: /repository/php4/ext/iconv/tests/test.inc,v
retrieving revision 1.1
diff -u -r1.1 test.inc
--- test.inc 28 Oct 2002 17:15:21 -0000 1.1
+++ test.inc 28 Oct 2002 18:35:25 -0000
@@ -1,8 +1,7 @@
<?php
-// This script prints "skip" if condition does not meet.
-
-if (!extension_loaded("iconv") && ini_get("enable_dl")) {
- $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
- @dl("iconv$dlext");
-}
+// Do not dl load extension
+//if (!extension_loaded("iconv") && ini_get("enable_dl")) {
+// $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
+// @dl("iconv$dlext");
+//}
?>
At 19:30 28.10.2002, Melvyn Sopacua wrote:
At 19:01 28-10-2002, Marcus B�rger wrote:At 18:33 28.10.2002, Melvyn Sopacua wrote:At 18:15 28-10-2002, Marcus B�rger wrote:Log: fix this tests -they did not dl load module in test....Yes, exactly as they shouldn't. It's been discussed. Why did you revert that? The main reason - to repeat it: ./configure --prefix=/previous/install dl('foo.so') => foo.so version is previous install, not current!I did so because skipif.inc did so. Maybe we remove that code from both skipif.inc and test.inc now. Feel free to do that.Ok, then that was a left over. IMHO we should do a complete overhaul of */tests/* and remove any dl() code, or come up with something, that will force the modules/ directory on the testkit. This is again a good reason to setup php.ini-test. Windows will then be a problem, which kinda makes the dl() thingy troublesome as well. The only thing I can think of to work around it, is to use a configure option, that writes --with-test-modules-dir= into php.ini-test. But that's prolly overkill. Met vriendelijke groeten / With kind regards, Webmaster IDG.nl Melvyn Sopacua
