cvs: ZendEngine2(PHP_5_2) /tests bug34617.phpt php-src/ext/ftp/tests 004.phpt php-src/ext/standard/tests/array locale_sort.phpt php-src/tests/lang
bug30638.phpt
| From: | Hannes Magnusson | Date: | Tue, 19 Dec 2006 10:03:24 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) /tests bug34617.phpt php-src/ext/ftp/tests 004.phpt php-src/ext/standard/tests/array locale_sort.phpt php-src/tests/lang bug30638.phpt |
||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-5483@lists.php.net to get a copy of this message | ||
bjori Tue Dec 19 10:03:24 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/tests/lang bug30638.phpt
/php-src/ext/standard/tests/array locale_sort.phpt
/php-src/ext/ftp/tests 004.phpt
/ZendEngine2/tests bug34617.phpt
Log:
Fix tests
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug30638.phpt?r1=1.2&r2=1.2.4.1&diff_format=u
Index: php-src/tests/lang/bug30638.phpt
diff -u php-src/tests/lang/bug30638.phpt:1.2 php-src/tests/lang/bug30638.phpt:1.2.4.1
--- php-src/tests/lang/bug30638.phpt:1.2 Wed Nov 3 23:36:51 2004
+++ php-src/tests/lang/bug30638.phpt Tue Dec 19 10:03:24 2006
@@ -3,7 +3,7 @@
--SKIPIF--
<?php # try to activate a german locale
if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge")
=== FALSE) {
- print "skip";
+ print "skip setlocale() failed";
}
?>
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/locale_sort.phpt?r1=1.2&r2=1.2.4.1&diff_format=u
Index: php-src/ext/standard/tests/array/locale_sort.phpt
diff -u php-src/ext/standard/tests/array/locale_sort.phpt:1.2
php-src/ext/standard/tests/array/locale_sort.phpt:1.2.4.1
--- php-src/ext/standard/tests/array/locale_sort.phpt:1.2 Tue Mar 22 16:03:10 2005
+++ php-src/ext/standard/tests/array/locale_sort.phpt Tue Dec 19 10:03:24 2006
@@ -2,13 +2,13 @@
Sort with SORT_LOCALE_STRING
--SKIPIF--
<?php
-if ("fr_FR" != setlocale(LC_CTYPE, "fr_FR")) {
+if (false == setlocale(LC_CTYPE, "fr_FR", "fr_FR.ISO8859-1")) {
die("skip setlocale() failed\n");
}
?>
--FILE--
<?php
-setlocale(LC_ALL, 'fr_FR');
+setlocale(LC_ALL, 'fr_FR', 'fr_FR.ISO8859-1');
$table = array("AB" => "Alberta",
"BC" => "Colombie-Britannique",
"MB" => "Manitoba",
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/004.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/ftp/tests/004.phpt
diff -u php-src/ext/ftp/tests/004.phpt:1.1.2.3 php-src/ext/ftp/tests/004.phpt:1.1.2.4
--- php-src/ext/ftp/tests/004.phpt:1.1.2.3 Mon Nov 27 11:43:59 2006
+++ php-src/ext/ftp/tests/004.phpt Tue Dec 19 10:03:24 2006
@@ -56,7 +56,7 @@
Warning: ftp_close() expects exactly 1 parameter, 0 given in %s004.php on line 17
NULL
-Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: %s not known in %s004.php on
line 18
+Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: %s in %s004.php on line 18
bool(false)
Warning: ftp_delete() expects parameter 2 to be string, array given in %s004.php on line 19
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug34617.phpt?r1=1.1.4.2&r2=1.1.4.2.2.1&diff_format=u
Index: ZendEngine2/tests/bug34617.phpt
diff -u ZendEngine2/tests/bug34617.phpt:1.1.4.2 ZendEngine2/tests/bug34617.phpt:1.1.4.2.2.1
--- ZendEngine2/tests/bug34617.phpt:1.1.4.2 Tue Sep 27 18:07:41 2005
+++ ZendEngine2/tests/bug34617.phpt Tue Dec 19 10:03:24 2006
@@ -1,7 +1,7 @@
--TEST--
Bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called)
--SKIPIF--
-<?php if (!extension_loaded("xml")) print "skip"; ?>
+<?php if (!extension_loaded("xml")) print "skip the xml extension not
available"; ?>
--FILE--
<?php
class Thing {}
@@ -15,4 +15,4 @@
boom();
?>
--EXPECT--
-ok
\ No newline at end of file
+ok