OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust test to pass with latest glibc 

Glibc changed the it_IT locales to use thousands separators,
invalidating this test. Use nl_NL instead, as Dutch only uses grouping
for money not numbers.

	* testsuite/22_locale/numpunct/members/char/3.cc: Adjust test to
	account for change to glibc it_IT localedata (glibc bz#10797).

From-SVN: r265165
This commit is contained in:
Jonathan Wakely 2018-10-15 14:55:42 +01:00 committed by Jonathan Wakely
parent f9bd185f18
commit b219eb0378
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,8 @@
2018-10-15 Jonathan Wakely <jwakely@redhat.com> 2018-10-15 Jonathan Wakely <jwakely@redhat.com>
* testsuite/22_locale/numpunct/members/char/3.cc: Adjust test to
account for change to glibc it_IT localedata (glibc bz#10797).
PR libstdc++/87587 PR libstdc++/87587
* src/c++11/cxx11-shim_facets.cc: Suppress -Wabi warnings. * src/c++11/cxx11-shim_facets.cc: Suppress -Wabi warnings.

6
libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc
View File

@ -1,4 +1,4 @@
// { dg-require-namedlocale "it_IT.ISO8859-15" } // { dg-require-namedlocale "nl_NL.ISO8859-15" }
// 2001-01-24 Benjamin Kosnik <bkoz@redhat.com> // 2001-01-24 Benjamin Kosnik <bkoz@redhat.com>
@ -28,12 +28,14 @@ void test02()
{ {
using namespace std; using namespace std;
locale loc_it = locale(ISO_8859(15,it_IT)); // nl_NL chosen because it has no thousands separator (at this time).
locale loc_it = locale(ISO_8859(15,nl_NL));
const numpunct<char>& nump_it = use_facet<numpunct<char> >(loc_it); const numpunct<char>& nump_it = use_facet<numpunct<char> >(loc_it);
string g = nump_it.grouping(); string g = nump_it.grouping();
// Ensure that grouping is empty for locales with empty thousands separator.
VERIFY( g == "" ); VERIFY( g == "" );
} }