com php-src: make the test more reliable: ext/date/tests/00 9_win32.phpt

From: Date: Sun, 24 May 2015 21:49:40 +0000
Subject: com php-src: make the test more reliable: ext/date/tests/00 9_win32.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86901@lists.php.net to get a copy of this message
Commit: 977055343709e711428ec88883019ece5119f684 Author: Anatol Belski <ab@php.net> Fri, 22 May 2015 08:01:48 +0200 Parents: a1ef8b418d88798d2e23b9a89f944c0dc52e0928 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=977055343709e711428ec88883019ece5119f684 Log: make the test more reliable Changed paths: M ext/date/tests/009_win32.phpt Diff: diff --git a/ext/date/tests/009_win32.phpt b/ext/date/tests/009_win32.phpt index cbdc8b7..3ad04f5 100644 --- a/ext/date/tests/009_win32.phpt +++ b/ext/date/tests/009_win32.phpt @@ -4,11 +4,15 @@ strftime() and gmstrftime() tests <?php if (substr(PHP_OS, 0, 3) != 'WIN') die('skip only windows test.'); if (!function_exists('strftime')) die("skip, strftime not available"); +if (false === setlocale(LC_TIME, "en-us")) die("skip, couldn't set the locale to en-us"); ?> --FILE-- <?php date_default_timezone_set('Asia/Jerusalem'); +$loc = setlocale(LC_TIME, "0"); +setlocale(LC_TIME, "en-us"); + $t = mktime(0,0,0, 6, 27, 2006); var_dump(strftime()); @@ -32,19 +36,21 @@ var_dump(gmstrftime("%%q %%a", $t)); var_dump(gmstrftime("blah", $t)); echo "Done\n"; + +setlocale(LC_TIME, $loc); ?> --EXPECTF-- Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d bool(false) bool(false) -string(%d) "Tue Tuesday Jun June 06/27/06 00:00:00 27 00 12 178 06 00 AM 00 26 26 2 06/27/06 00:00:00 06 2006 %s" +string(%d) "Tue Tuesday Jun June 6/27/2006 12:00:00 AM 27 00 12 178 06 00 AM 00 26 26 2 6/27/2006 12:00:00 AM 06 2006 %s" string(5) "%q %a" string(4) "blah" Warning: gmstrftime() expects at least 1 parameter, 0 given in %s on line %d bool(false) bool(false) -string(%d) "Mon Monday Jun June 06/26/06 21:00:00 26 21 09 177 06 00 PM 00 26 26 1 06/26/06 21:00:00 06 2006 %s" +string(%d) "Mon Monday Jun June 6/26/2006 9:00:00 PM 26 21 09 177 06 00 PM 00 26 26 1 6/26/2006 9:00:00 PM 06 2006 %s" string(5) "%q %a" string(4) "blah" Done

« previous php.cvs (#86901) next »