felipe Sat Apr 19 23:11:26 2008 UTC
Modified files:
/ZendEngine2/tests 030.phpt
/php-src/ext/standard/tests/array natcasesort_variation3.phpt
/php-src/ext/standard/tests/network ip_x86_64.phpt
Log:
- Fixed tests
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/030.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/030.phpt
diff -u ZendEngine2/tests/030.phpt:1.1 ZendEngine2/tests/030.phpt:1.2
--- ZendEngine2/tests/030.phpt:1.1 Fri Apr 18 13:54:46 2008
+++ ZendEngine2/tests/030.phpt Sat Apr 19 23:11:26 2008
@@ -68,31 +68,31 @@
ok
--UEXPECTF--
object(Exception)#2 (6) {
- ["message":protected]=>
- string(3) "foo"
- ["string":"Exception":private]=>
- string(0) ""
- ["code":protected]=>
+ [u"message":protected]=>
+ unicode(3) "foo"
+ [u"string":u"Exception":private]=>
+ unicode(0) ""
+ [u"code":protected]=>
int(0)
- ["file":protected]=>
- string(32) "%s"
- ["line":protected]=>
+ [u"file":protected]=>
+ unicode(%d) "%s"
+ [u"line":protected]=>
int(%d)
- ["trace":"Exception":private]=>
+ [u"trace":u"Exception":private]=>
array(1) {
[0]=>
array(6) {
- ["file"]=>
- string(32) "%s"
- ["line"]=>
+ [u"file"]=>
+ unicode(%d) "%s"
+ [u"line"]=>
int(%d)
- ["function"]=>
- string(3) "bar"
- ["class"]=>
- string(3) "foo"
- ["type"]=>
- string(2) "->"
- ["args"]=>
+ [u"function"]=>
+ unicode(3) "bar"
+ [u"class"]=>
+ unicode(3) "foo"
+ [u"type"]=>
+ unicode(2) "->"
+ [u"args"]=>
array(0) {
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/natcasesort_variation3.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/natcasesort_variation3.phpt
diff -u php-src/ext/standard/tests/array/natcasesort_variation3.phpt:1.2
php-src/ext/standard/tests/array/natcasesort_variation3.phpt:1.3
--- php-src/ext/standard/tests/array/natcasesort_variation3.phpt:1.2 Tue Feb
19 10:54:02 2008
+++ php-src/ext/standard/tests/array/natcasesort_variation3.phpt Sat Apr
19 23:11:26 2008
@@ -1,5 +1,9 @@
--TEST--
Test natcasesort() function : usage variations - different numeric types
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
--FILE--
<?php
/* Prototype : bool natcasesort(array &$array_arg)
@@ -219,4 +223,4 @@
[1]=>
float(2147483648)
}
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/ip_x86_64.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/network/ip_x86_64.phpt
diff -u php-src/ext/standard/tests/network/ip_x86_64.phpt:1.1
php-src/ext/standard/tests/network/ip_x86_64.phpt:1.2
--- php-src/ext/standard/tests/network/ip_x86_64.phpt:1.1 Sat Sep 1
18:37:27 2007
+++ php-src/ext/standard/tests/network/ip_x86_64.phpt Sat Apr 19 23:11:26 2008
@@ -48,20 +48,51 @@
int(1118019956)
string(14) "66.163.161.116"
-Warning: Wrong parameter count for ip2long() in %s on line %d
+Warning: ip2long() expects exactly 1 parameter, 0 given in %s on line %d
NULL
bool(false)
bool(false)
int(1869573999)
-Notice: Array to string conversion in %s on line %d
-bool(false)
+Warning: ip2long() expects parameter 1 to be string, array given in %s on line
%d
+NULL
-Warning: Wrong parameter count for long2ip() in %s on line %d
+Warning: long2ip() expects exactly 1 parameter, 0 given in %s on line %d
NULL
string(13) "255.254.82.80"
string(7) "0.0.0.0"
-Notice: Array to string conversion in %s on line %d
-string(7) "0.0.0.0"
+Warning: long2ip() expects parameter 1 to be string, array given in %s on line
%d
+NULL
+Done
+--UEXPECTF--
+int(2130706433)
+unicode(9) "127.0.0.1"
+int(167772161)
+unicode(8) "10.0.0.1"
+int(4294967295)
+unicode(15) "255.255.255.255"
+int(4294967040)
+unicode(13) "255.255.255.0"
+int(0)
+unicode(7) "0.0.0.0"
+int(1118019956)
+unicode(14) "66.163.161.116"
+
+Warning: ip2long() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+bool(false)
+bool(false)
+int(1869573999)
+
+Warning: ip2long() expects parameter 1 to be binary string, array given in %s
on line %d
+NULL
+
+Warning: long2ip() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+unicode(13) "255.254.82.80"
+unicode(7) "0.0.0.0"
+
+Warning: long2ip() expects parameter 1 to be binary string, array given in %s
on line %d
+NULL
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
