tyrael Mon, 16 May 2011 23:22:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311113
Log:
reverting 311103,311105-311109, will commit them to all three branches
Changed paths:
U php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format_a.phpt
U php/php-src/branches/PHP_5_3/ext/date/tests/bug51819.phpt
U php/php-src/branches/PHP_5_3/ext/date/tests/bug51994.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug39863.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/001.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_001.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_001.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_002.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_003.phpt
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format_a.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format_a.phpt
2011-05-16 22:24:41 UTC (rev 311112)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format_a.phpt
2011-05-16 23:22:17 UTC (rev 311113)
@@ -3,13 +3,8 @@
--CREDITS--
Daniel Convissor <[email protected]>
# TestFest 2010 BKTK
---INI--
-date.timezone=UTC
--SKIPIF--
-<?php
-if (!method_exists('DateInterval', 'format')) die("skip: method doesn't
exist");
-if (substr(PHP_OS, 0, 3) != 'WIN') die("skip this test is for Windows
platforms only");
-?>
+<?php if (!method_exists('DateInterval', 'format')) die("skip: method doesn't
exist"); ?>
--XFAIL--
Windows VC6 libs' floor()/ceil() choke on floats
--FILE--
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/bug51819.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/tests/bug51819.phpt 2011-05-16
22:24:41 UTC (rev 311112)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/bug51819.phpt 2011-05-16
23:22:17 UTC (rev 311113)
@@ -1,7 +1,5 @@
--TEST--
Bug #51819 (Case discrepancy in timezone names cause Uncaught exception and
fatal error)
---XFAIL--
-Bug #51819 isn't fixed yet
--FILE--
<?php
date_default_timezone_set('UTC');
@@ -32,4 +30,4 @@
var_dump('this should be the only output');
?>
--EXPECTF--
-string(30) "this should be the only output"
+string(30) "this should be the only output"
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/bug51994.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/tests/bug51994.phpt 2011-05-16
22:24:41 UTC (rev 311112)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/bug51994.phpt 2011-05-16
23:22:17 UTC (rev 311113)
@@ -1,7 +1,5 @@
--TEST--
Bug #51994 (date_parse_from_format is parsing invalid date using 'yz' format)
---XFAIL--
-Bug #51994 isn't fixed yet
--FILE--
<?php
$trans_date = '10153'; // 152nd day of year 2010 -> 03.06.2010
@@ -37,4 +35,4 @@
}
["is_localtime"]=>
bool(false)
-}
+}
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug39863.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug39863.phpt
2011-05-16 22:24:41 UTC (rev 311112)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug39863.phpt
2011-05-16 23:22:17 UTC (rev 311113)
@@ -16,6 +16,8 @@
?>
===DONE===
<?php exit(0); ?>
+--XFAIL--
+Needs bug #39863 fixed
--EXPECT--
PASS
===DONE===
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt
2011-05-16 22:24:41 UTC (rev 311112)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt
2011-05-16 23:22:17 UTC (rev 311113)
@@ -19,6 +19,7 @@
$hostname = 'string_val';
$extra_arg = 10;
var_dump( gethostbynamel($hostname, $extra_arg) );
+
echo "Done";
?>
--EXPECTF--
@@ -33,4 +34,5 @@
Warning: gethostbynamel() expects exactly 1 parameter, 2 given in %s on line %d
NULL
+
Done
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/001.phpt
2011-05-16 22:24:41 UTC (rev 311112)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/001.phpt
2011-05-16 23:22:17 UTC (rev 311113)
@@ -1,7 +1,5 @@
--TEST--
serialize()/unserialize()/var_dump()
---INI--
-serialize_precision=100
--FILE--
<?php
class t
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_001.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_001.phpt
2011-05-16 22:24:41 UTC (rev 311112)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_arrays_001.phpt
2011-05-16 23:22:17 UTC (rev 311113)
@@ -1,7 +1,5 @@
--TEST--
Test serialize() & unserialize() functions: arrays (circular references)
---INI--
-serialize_precision=100
--FILE--
<?php
/* Prototype : proto string serialize(mixed variable)
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_001.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_001.phpt
2011-05-16 22:24:41 UTC (rev 311112)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_001.phpt
2011-05-16 23:22:17 UTC (rev 311113)
@@ -1,7 +1,5 @@
--TEST--
Test serialize() & unserialize() functions: objects
---INI--
-serialize_precision=100
--FILE--
<?php
/* Prototype : proto string serialize(mixed variable)
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_002.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_002.phpt
2011-05-16 22:24:41 UTC (rev 311112)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_002.phpt
2011-05-16 23:22:17 UTC (rev 311113)
@@ -1,7 +1,5 @@
--TEST--
Test serialize() & unserialize() functions: objects (variations)
---INI--
-serialize_precision=100
--FILE--
<?php
/* Prototype : proto string serialize(mixed variable)
@@ -321,4 +319,4 @@
NULL
}
-Done
+Done
\ No newline at end of file
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_003.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_003.phpt
2011-05-16 22:24:41 UTC (rev 311112)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/serialization_objects_003.phpt
2011-05-16 23:22:17 UTC (rev 311113)
@@ -1,7 +1,5 @@
--TEST--
Test serialize() & unserialize() functions: objects (abstract classes)
---INI--
-serialize_precision=100
--FILE--
<?php
/* Prototype : proto string serialize(mixed variable)
@@ -66,4 +64,4 @@
string(18) "s:10:"extendName";"
string(10) "extendName"
-Done
+Done
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
