summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-12-07 09:03:07 +0000
committerPierre Joye <pajoye@php.net>2011-12-07 09:03:07 +0000
commit2ae3a4d8496d10bc90e48294f688b5c07d7c4102 (patch)
tree72f1fcb30c6bc159a9c1e1f2b4d6b098c272d535
parent361c162058b5064a4d9d8f4f70a11196d376dcdd (diff)
downloadphp-git-2ae3a4d8496d10bc90e48294f688b5c07d7c4102.tar.gz
- print_r seems to display 0 or nothing for days, let make that test works in both cases, that's not the purpose of this test to test print_r
-rw-r--r--ext/date/tests/bug48678.phpt6
-rw-r--r--ext/date/tests/date_default_timezone_set-1.phpt4
2 files changed, 7 insertions, 3 deletions
diff --git a/ext/date/tests/bug48678.phpt b/ext/date/tests/bug48678.phpt
index 7e243351e3..ec39153787 100644
--- a/ext/date/tests/bug48678.phpt
+++ b/ext/date/tests/bug48678.phpt
@@ -6,7 +6,7 @@ $x = new DateInterval("P3Y6M4DT12H30M5S");
print_r($x);
$y = unserialize(serialize($x));
print_r($y);
---EXPECT--
+--EXPECTF--
DateInterval Object
(
[y] => 3
@@ -16,7 +16,7 @@ DateInterval Object
[i] => 30
[s] => 5
[invert] => 0
- [days] =>
+ [days] =>%s
)
DateInterval Object
(
@@ -27,5 +27,5 @@ DateInterval Object
[i] => 30
[s] => 5
[invert] => 0
- [days] =>
+ [days] =>%s
)
diff --git a/ext/date/tests/date_default_timezone_set-1.phpt b/ext/date/tests/date_default_timezone_set-1.phpt
index c6a6daf7a8..bca8789e78 100644
--- a/ext/date/tests/date_default_timezone_set-1.phpt
+++ b/ext/date/tests/date_default_timezone_set-1.phpt
@@ -1,5 +1,9 @@
--TEST--
date_default_timezone_set() function [1]
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') die('skip diff TZ detection on windows.');
+?>
--INI--
date.timezone=
--FILE--