22.locale.time.put.cpp

Martin Sebor Wed, 09 Apr 2008 13:34:30 -0700

[EMAIL PROTECTED] wrote:

Author: faridz
Date: Wed Apr  9 12:25:47 2008
New Revision: 646489


URL: http://svn.apache.org/viewvc?rev=646489&view=rev
Log:
2008-04-09  Farid Zaripov  <[EMAIL PROTECTED]>

        * tests/localization/22.locale.time.put.cpp (set_TZ): New function to 
set TZ
        environment variable and update the state of the global CRT variables 
using tzset().
        (test_POSIX): Use set_TZ() instead of rw_putenv(). Use three-letter 
time zone name,
        because the MSVC CRT doesn't supports the time zone names longer than 
three letter.

Modified:
    stdcxx/trunk/tests/localization/22.locale.time.put.cpp

Modified: stdcxx/trunk/tests/localization/22.locale.time.put.cpp
URL: 
http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.time.put.cpp?rev=646489&r1=646488&r2=646489&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.time.put.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.time.put.cpp Wed Apr  9 12:25:47 
2008
@@ -33,7 +33,7 @@
 #include <cstdio>        // for fprintf(), ...
 #include <cstdlib>       // for mbstowcs(), wcstombs()
 #include <cstring>       // for memcpy(), strlen()
-#include <ctime>         // for tm
+#include <ctime>         // for tm, tzset()
 #include <cwchar>        // for wcsftime(), wcslen()
 #include <cassert>       // for assert()

@@ -56,6 +56,12 @@

 // set in main() instead of here to avoid Solaris 7 putenv() bug (PR #30017)
 const char* locale_root;

+inline void set_TZ (const char* str)

+{
+    rw_putenv (str);
+    tzset ();


I'm afraid this doesn't compile with EDG eccp and will probably break
with other similarly strict compilers including HP C++ on Tru64 UNIX.
tzset() is not a C++/C89 function so it may not be declared by
a strictly conforming implementation of <ctime>.

Also, I think we do still want to exercise zone names that are longer
than 3 characters on platforms that support such names. If Windows or
any other platform has a limitation on their length we avoid running
these tests there. FYI: POSIX specifies the behavior of tzset() only
for zone names that are at most {TZNAME_MAX} bytes long, so perhaps
we should test the value of this macro and enable/disable zone name
tests based on its value where it's defined. If Windows doesn't
define it we can hardcode it to the documented limit of 3.

That being said, since the test you changed are designed to exercise
a two-digit hour and not zone names longer than 3 bytes I think it's
fine to keep the change you've made and just add a few new test cases
for such names.

Martin

+}
+
 /**************************************************************************/

const char* narrow (char *dst, const char *src)

@@ -1504,89 +1510,89 @@
     // the tznames global variable by tzset())

// unset TZ -- expect no output

-    rw_putenv ("TZ=");
+    set_TZ ("TZ=");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0, +1), "%z", 0, 0, ' ', "");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0, -1), "%z", 0, 0, ' ', "");

// set TZ to GMT (UTC) plus zero hours, no DST

-    rw_putenv ("TZ=std0");
+    set_TZ ("TZ=std0");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0000");
     // no DST specified, zone info not applicable
     // TEST (T (0, 0, 1, 0, 0, 0, 0, 0, +1), "%z", 0, 0, ' ', "+0000");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0, -1), "%z", 0, 0, ' ', "");

// set TZ to GMT+7 hours, no DST

-    rw_putenv ("TZ=foo+7");
+    set_TZ ("TZ=foo+7");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0700");
     // no DST specified, zone info not applicable
     // TEST (T (0, 0, 1, 0, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0700");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0, -1), "%z", 0, 0, ' ', "");

// set TZ to GMT+1 hours and DST to GMT+2 hours

-    rw_putenv ("TZ=abc1def2");
+    set_TZ ("TZ=abc1def2");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0100");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0200");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0, -1), "%z", 0, 0, ' ', "");

// set TZ to GMT+2 hours and DST to GMT+4 hours

-    rw_putenv ("TZ=abc2def4");
+    set_TZ ("TZ=abc2def4");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0200");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0400");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0, -1), "%z", 0, 0, ' ', "");

// set TZ to GMT+3 hours and DST to GMT+4 hours

-    rw_putenv ("TZ=abc3:00def4:00");
+    set_TZ ("TZ=abc3:00def4:00");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0300");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0400");

// set TZ to GMT+11:30 hours and DST to GMT+11:45 hours

-    rw_putenv ("TZ=abc11:30:00def11:45");
+    set_TZ ("TZ=abc11:30:00def11:45");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+1130");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+1145");

// TZ: STD=GMT+12:34, empty DST

     // According to POSIX, when no offset follows DST, the alternative
     // time is assumed to be one hour ahead of standard time.
-    rw_putenv ("TZ=bcd12:34efg");
+    set_TZ ("TZ=bcd12:34efg");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+1234");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+1334");

// TZ: STD=GMT+23:01, empty DST

-    rw_putenv ("TZ=cde23:01fgh");
+    set_TZ ("TZ=cde23:01fgh");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+2301");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0001");

// TZ: STD=GMT+23:59, empty DST

-    rw_putenv ("TZ=def23:59ghi");
+    set_TZ ("TZ=def23:59ghi");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+2359");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0059");

- rw_putenv ("TZ=EST03:00<EDT1>04:00");

+    set_TZ ("TZ=EST03:00<EDT1>04:00");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0300");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0400");

# if 0 // disabled tests of funky std/dst strings- rw_putenv ("TZ=<EST+2>03:21EDT04:32");

+    set_TZ ("TZ=<EST+2>03:21EDT04:32");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0321");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0432");

- rw_putenv ("TZ=EST04:32:10<EDT+03>05:43:21");

+    set_TZ ("TZ=EST04:32:10<EDT+03>05:43:21");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0432");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0543");

# endif // 0/1- rw_putenv ("TZ=EST-4EDT-5");

+    set_TZ ("TZ=EST-4EDT-5");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "-0400");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "-0500");

- rw_putenv ("TZ=EST-5:00EDT-6:00");

+    set_TZ ("TZ=EST-5:00EDT-6:00");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "-0500");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "-0600");

- rw_putenv ("TZ=EST-5:43EDT-6:54");

+    set_TZ ("TZ=EST-5:43EDT-6:54");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "-0543");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "-0654");

@@ -1601,14 +1607,14 @@

     // likely expects it to take effect; otherwise POSIX-compliant
     // behavior is assumed to be expected

- rw_putenv ("TZ"); // unset

+    set_TZ ("TZ");   // unset
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0,     60), "%z", 0, 0, ' ', "+0001");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1,    120), "%z", 0, 0, ' ', "+0002");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0, -1,    180), "%z", 0, 0, ' ', "");

// setting TZ to an arbitrary value should have no effect

     // regardless of the value of the tm_isdst flag
-    rw_putenv ("TZ=PST8");
+    set_TZ ("TZ=PST8");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0,   3600), "%z", 0, 0, ' ', "+0100");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1,  -7260), "%z", 0, 0, ' ', "-0201");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0, -1,   1234), "%z", 0, 0, ' ', "");
@@ -1628,19 +1634,19 @@

rw_info (0, 0, __LINE__, "%%z: SunOS UZ/zone format [platform-specific]");- rw_putenv ("TZ=US/Eastern");

+    set_TZ ("TZ=US/Eastern");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0500");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0600");

- rw_putenv ("TZ=US/Central");

+    set_TZ ("TZ=US/Central");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0600");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0700");

- rw_putenv ("TZ=US/Mountain");

+    set_TZ ("TZ=US/Mountain");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0700");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0800");

- rw_putenv ("TZ=US/Pacific");

+    set_TZ ("TZ=US/Pacific");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%z", 0, 0, ' ', "+0800");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%z", 0, 0, ' ', "+0900");

@@ -1652,7 +1658,7 @@

     rw_info (0, 0, __LINE__,
              "%%Z: the locale's time zone name or abbreviation");

- rw_putenv ("TZ=foo0bar1");

+    set_TZ ("TZ=foo0bar1");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%Z", 0, 0, ' ', "foo");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%Z", 0, 0, ' ', "bar");

@@ -1660,7 +1666,7 @@

     // is undefined, avoid exercising it
     // TEST (T (0, 0, 0, 1, 0, 0, 0, 0, -1), "%Z", 0, 0, ' ', "bar");

- rw_putenv ("TZ=EST1EDT2");

+    set_TZ ("TZ=EST1EDT2");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%Z", 0, 0, ' ', "EST");
     TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%Z", 0, 0, ' ', "EDT");

@@ -1669,9 +1675,9 @@

     // TEST (T (0, 0, 0, 1, 0, 0, 0, 0, -1), "%Z", 0, 0, ' ', "EDT");

// exercise two-digit hour

-    rw_putenv ("TZ=ABCD01DEFG02");
-    TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%Z", 0, 0, ' ', "ABCD");
-    TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%Z", 0, 0, ' ', "DEFG");
+    set_TZ ("TZ=ABC01DEF02");
+    TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  0), "%Z", 0, 0, ' ', "ABC");
+    TEST (T (0, 0, 0, 1, 0, 0, 0, 0,  1), "%Z", 0, 0, ' ', "DEF");

//////////////////////////////////////////////////////////////////

     // %%: replaced by %

Re: svn commit: r646489 - /stdcxx/trunk/tests/localization/22.locale.time.put.cpp

Reply via email to