This removes a new fail that happens on bleeding edge linux with
the testcase in the subject line.
The behavior of the es_ES locale with respect to grouping has changed
in some version of glibc around 2.14.90-x. It used to have no grouping,
and now it has the usual "/003/003" grouping that one would expect. So,
I've modified the test case to deal with both cases, and add some
commentary.
With this, libstdc++ is back to zero fails on F16. Yay.
Tis a bit of a hack, but there is no ios_base::showgrouping and
corresponding manipulator to control the output of grouping characters
in the standard. I consider this a bug, and am in support of resolving
LWG-982 in a way that has some utility to C++ programmers. To this end,
I have drafted language for a proposed resolution and sent it to the LWG
chair.
best,
Benjamin
tested x86/linux f14 -- glibc-2.13-2
tested x86/linux f16 -- glibc 2.14.90-21
2011-12-15 Benjamin Kosnik <b...@redhat.com>
* testsuite/22_locale/num_put/put/char/9780-2.cc: Add test for "C"
locale, add sanity checks in case of grouping.
diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc
index 7993691..5cf0d04 100644
--- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc
+++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc
@@ -1,7 +1,7 @@
// { dg-require-namedlocale "de_DE" }
// { dg-require-namedlocale "es_ES" }
-// Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2009, 2011 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -22,23 +22,60 @@
#include <locale>
#include <testsuite_hooks.h>
-int main()
+// Make sure that formatted output uses the locale in the output stream.
+using namespace std;
+locale l1 = locale("de_DE");
+const num_put<char>& np = use_facet<num_put<char> >(l1);
+const numpunct<char>& npunct = use_facet<numpunct<char> >(l1);
+
+void test01()
{
- using namespace std;
+ bool test __attribute__((unused)) = true;
+
+ locale l2 = locale("C");
+ const numpunct<char>& npunct2 = use_facet<numpunct<char> >(l2);
+ char c = npunct2.thousands_sep();
+ string s = npunct2.grouping();
+
+ ostringstream oss;
+ oss.imbue(l2);
+
+ long l = 1234567890;
+ np.put(oss.rdbuf(), oss, ' ', l);
+ string res = oss.str();
+
+ VERIFY( res == "1234567890" );
+}
+void test02()
+{
bool test __attribute__((unused)) = true;
- locale l1 = locale("de_DE");
+
locale l2 = locale("es_ES");
-
- const num_put<char>& np = use_facet<num_put<char> >(l1);
+ const numpunct<char>& npunct3 = use_facet<numpunct<char> >(l2);
+ char c = npunct3.thousands_sep();
+ string s = npunct3.grouping();
+
ostringstream oss;
oss.imbue(l2);
long l = 1234567890;
- np.put(oss.rdbuf(), oss, ' ', l); // 1234567890
+ np.put(oss.rdbuf(), oss, ' ', l);
string res = oss.str();
-
- VERIFY( res == "1234567890" );
+ if (!s.empty())
+ VERIFY( res == "1.234.567.890" );
+ else
+ VERIFY( res == "1234567890" );
+}
+
+int main()
+{
+ // Sanity check.
+ char c = npunct.thousands_sep();
+ string s = npunct.grouping();
+
+ test01();
+ test02();
return 0;
}
