wez Fri Dec 5 08:42:05 2003 EDT Modified files: /php-src/ext/com_dotnet/tests variants.phpt /php-src/ext/session/tests skipif.inc /php-src/ext/sqlite/tests blankdb.inc blankdb_oo.inc sqlite_001.phpt sqlite_015.phpt sqlite_017.phpt sqlite_oo_020.phpt /php-src/ext/standard/tests/strings bug24098.phpt nl2br.phpt Log: Make these tests work under win32 Index: php-src/ext/com_dotnet/tests/variants.phpt diff -u php-src/ext/com_dotnet/tests/variants.phpt:1.1 php-src/ext/com_dotnet/tests/variants.phpt:1.2 --- php-src/ext/com_dotnet/tests/variants.phpt:1.1 Thu Aug 14 12:49:56 2003 +++ php-src/ext/com_dotnet/tests/variants.phpt Fri Dec 5 08:42:02 2003 @@ -2,9 +2,9 @@ COM: General variant tests --SKIPIF-- <?php # vim:ft=php -if (!extension_loaded("com_dotnet")) print "skip"; ?> +if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> --FILE-- -<?php // $Id: variants.phpt,v 1.1 2003/08/14 16:49:56 wez Exp $ +<?php // $Id: variants.phpt,v 1.2 2003/12/05 13:42:02 wez Exp $ error_reporting(E_ALL); $v = new VARIANT(); @@ -30,8 +30,6 @@ } } } -$a = new VARIANT('10.0', VT_DECIMAL); -var_dump($a); echo "OK!"; ?> Index: php-src/ext/session/tests/skipif.inc diff -u php-src/ext/session/tests/skipif.inc:1.2 php-src/ext/session/tests/skipif.inc:1.3 --- php-src/ext/session/tests/skipif.inc:1.2 Thu Oct 3 11:11:01 2002 +++ php-src/ext/session/tests/skipif.inc Fri Dec 5 08:42:03 2003 @@ -5,6 +5,9 @@ @dl("session$dlext"); } if (!extension_loaded("session")) { - die("skip\n"); + die("skip Session module not loaded"); +} +if (!file_exists(ini_get("session.save_path"))) { + die("skip Session save_path doesn't exist"); } ?> Index: php-src/ext/sqlite/tests/blankdb.inc diff -u php-src/ext/sqlite/tests/blankdb.inc:1.2 php-src/ext/sqlite/tests/blankdb.inc:1.3 --- php-src/ext/sqlite/tests/blankdb.inc:1.2 Fri Apr 18 16:53:18 2003 +++ php-src/ext/sqlite/tests/blankdb.inc Fri Dec 5 08:42:03 2003 @@ -1,8 +1,9 @@ <?php #vim:ft=php $dbname = tempnam(dirname(__FILE__), "phpsql"); function cleanup() { - if ($GLOBALS['db']) { - sqlite_close($GLOBALS['db']); + if (is_resource($GLOBALS['db'])) { + @sqlite_close($GLOBALS['db']); + usleep(500000); } unlink($GLOBALS['dbname']); } Index: php-src/ext/sqlite/tests/blankdb_oo.inc diff -u php-src/ext/sqlite/tests/blankdb_oo.inc:1.2 php-src/ext/sqlite/tests/blankdb_oo.inc:1.3 --- php-src/ext/sqlite/tests/blankdb_oo.inc:1.2 Sun Jun 22 15:01:47 2003 +++ php-src/ext/sqlite/tests/blankdb_oo.inc Fri Dec 5 08:42:03 2003 @@ -2,9 +2,9 @@ $dbname = tempnam(dirname(__FILE__), "phpsql"); function cleanup() { global $db, $dbname; - $db = NULL; - unlink($dbname); + usleep(500000); + @unlink($dbname); } register_shutdown_function("cleanup"); $db = new sqlite_db($dbname); Index: php-src/ext/sqlite/tests/sqlite_001.phpt diff -u php-src/ext/sqlite/tests/sqlite_001.phpt:1.3 php-src/ext/sqlite/tests/sqlite_001.phpt:1.4 --- php-src/ext/sqlite/tests/sqlite_001.phpt:1.3 Thu May 1 09:29:11 2003 +++ php-src/ext/sqlite/tests/sqlite_001.phpt Fri Dec 5 08:42:03 2003 @@ -9,7 +9,6 @@ require_once('blankdb.inc'); echo "$db\n"; sqlite_close($db); -$db = NULL; echo "Done\n"; ?> --EXPECTF-- Index: php-src/ext/sqlite/tests/sqlite_015.phpt diff -u php-src/ext/sqlite/tests/sqlite_015.phpt:1.2 php-src/ext/sqlite/tests/sqlite_015.phpt:1.3 --- php-src/ext/sqlite/tests/sqlite_015.phpt:1.2 Thu Dec 4 21:12:21 2003 +++ php-src/ext/sqlite/tests/sqlite_015.phpt Fri Dec 5 08:42:03 2003 @@ -24,7 +24,7 @@ $res = sqlite_array_query("SELECT a from strings", $db, SQLITE_NUM); var_dump($res); -sqlite_close($db); +$db = null; echo "DONE!\n"; ?> Index: php-src/ext/sqlite/tests/sqlite_017.phpt diff -u php-src/ext/sqlite/tests/sqlite_017.phpt:1.2 php-src/ext/sqlite/tests/sqlite_017.phpt:1.3 --- php-src/ext/sqlite/tests/sqlite_017.phpt:1.2 Thu Dec 4 21:12:21 2003 +++ php-src/ext/sqlite/tests/sqlite_017.phpt Fri Dec 5 08:42:03 2003 @@ -22,8 +22,6 @@ } } -sqlite_close($db); - echo "OK!\n"; ?> Index: php-src/ext/sqlite/tests/sqlite_oo_020.phpt diff -u php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.3 php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.4 --- php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.3 Thu Sep 4 10:54:53 2003 +++ php-src/ext/sqlite/tests/sqlite_oo_020.phpt Fri Dec 5 08:42:03 2003 @@ -41,11 +41,13 @@ var_dump($r->current(SQLITE_NUM)); $r->next(); } +$r = null; +$db = null; echo "DONE!\n"; ?> --EXPECTF-- Message: sqlite_factory() expects at least 1 parameter, 0 given -File: %s/sqlite_oo_020.php +File: %ssqlite_oo_020.php array(2) { [0]=> string(3) "one" Index: php-src/ext/standard/tests/strings/bug24098.phpt diff -u php-src/ext/standard/tests/strings/bug24098.phpt:1.1 php-src/ext/standard/tests/strings/bug24098.phpt:1.2 --- php-src/ext/standard/tests/strings/bug24098.phpt:1.1 Mon Jun 9 14:12:36 2003 +++ php-src/ext/standard/tests/strings/bug24098.phpt Fri Dec 5 08:42:04 2003 @@ -1,5 +1,7 @@ --TEST-- Bug #24098 (pathinfo() crash) +--SKIPIF-- +<?php if (DIRECTORY_SEPARATOR == '\\') die("skip directory separator won't match expected output"); ?> --FILE-- <?php var_dump(pathinfo("/dsds.asa")); Index: php-src/ext/standard/tests/strings/nl2br.phpt diff -u php-src/ext/standard/tests/strings/nl2br.phpt:1.2 php-src/ext/standard/tests/strings/nl2br.phpt:1.3 --- php-src/ext/standard/tests/strings/nl2br.phpt:1.2 Fri Oct 11 07:03:36 2002 +++ php-src/ext/standard/tests/strings/nl2br.phpt Fri Dec 5 08:42:04 2003 @@ -21,7 +21,7 @@ string(4) "test" string(0) "" string(0) "" -string(8) "<br /> +string(8) "<br /> " string(7) "<br /> " @@ -29,19 +29,19 @@ string(8) "<br /> " string(44) "<br /> -<br /> +<br /> <br /><br /><br /><br />" string(47) "<br /> <br /> <br /> <br /> -<br /> -<br /> +<br /> +<br /> " string(66) "<br /> <br /> <br /> <br /> <br /> -<br /><br /><br /> +<br /><br /><br /> <br />"
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php