stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r413994 - /incubator/stdcxx/trunk/tests/localization/22.locale.time.put.cpp
Date Tue, 13 Jun 2006 22:38:06 GMT
Author: sebor
Date: Tue Jun 13 15:38:05 2006
New Revision: 413994

URL: http://svn.apache.org/viewvc?rev=413994&view=rev
Log:
2006-06-13  Martin Sebor  <sebor@roguewave.com>

	* 22.locale.time.put.cpp (do_test): Included the value of the TZ
	environment variable in diagnostics involving the "%Z" or "%z"
	formatting directives.

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

Modified: incubator/stdcxx/trunk/tests/localization/22.locale.time.put.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/localization/22.locale.time.put.cpp?rev=413994&r1=413993&r2=413994&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/localization/22.locale.time.put.cpp (original)
+++ incubator/stdcxx/trunk/tests/localization/22.locale.time.put.cpp Tue Jun 13 15:38:05 2006
@@ -252,13 +252,15 @@
         // format character, no modifier
         *tp.put (it, ios, fill, tmb, char (wpat [1])) = charT ();
 
-        bool ok = 0 == rw_strncmp (buf, result);
+        const bool success = 0 == rw_strncmp (buf, result);
 
-        rw_assert (!str || ok , __FILE__, lineno,
-                   "line %d. time_put<%s>::do_put (%{t}, ..., %#c) ==>"
+        rw_assert (!str || success , __FILE__, lineno,
+                   "line %d. time_put<%s>::do_put (%{t}, ..., %#c) "
+                   "%{?}with TZ=\"%{$TZ}\" %{;}==>"
                    " %{*Ac}, expected %{*Ac}%{?} (strftime format %#s)%{;}, "
                    "flags = %{If}",
                    __LINE__, tname, tmb, pat [1],
+                   'Z' == pat [1] || 'z' == pat [1],
                    int (sizeof *buf), buf, int (sizeof *result), result,
                    str && '%' == str [0], str, flags);
     }
@@ -268,9 +270,9 @@
         *tp.put (it, ios, fill, tmb, char (wpat [2]), char (wpat [1])) =
             charT ();
 
-        bool ok = 0 == rw_strncmp (buf, result);
+        const bool success = 0 == rw_strncmp (buf, result);
 
-        rw_assert (!str || ok , __FILE__, lineno,
+        rw_assert (!str || success , __FILE__, lineno,
                    "line %d. time_put<%s>::do_put (%{t}, ..., %#c, %#c) ==>"
                    " %{*Ac}, expected %{*Ac}%{?} (strftime format %#s)%{;}, "
                    "flags = %{If}",
@@ -287,10 +289,12 @@
     const bool success = 0 == rw_strncmp (buf, result);
 
     rw_assert (!str || success , __FILE__, lineno,
-               "line %d. time_put<%s>::do_put (%{t}, ..., %#s) ==>"
+               "line %d. time_put<%s>::do_put (%{t}, ..., %#s) "
+               "%{?}with TZ=\"%{$TZ}\" %{;}==>"
                " %{*Ac}, expected %{*Ac}%{?} (strftime format %#s)%{;}, "
                "flags = %{If}",
                __LINE__, tname, tmb, pat,
+               std::strstr (pat, "%Z") || std::strstr (pat, "%z"),
                int (sizeof *buf), buf, int (sizeof *result), result,
                str && '%' == str [0], str, flags);
 }



Mime
View raw message