diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-10-15 14:55:42 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-10-15 14:55:42 +0100 |
| commit | b219eb03783414d79349b6e21acc53b77d9cc5b2 (patch) | |
| tree | 175db1c939158d556428509cba6a8a5580b36b1a | |
| parent | f9bd185f189b26627959671bc65dc44d2e769e3e (diff) | |
| download | gcc-b219eb03783414d79349b6e21acc53b77d9cc5b2.zip gcc-b219eb03783414d79349b6e21acc53b77d9cc5b2.tar.gz gcc-b219eb03783414d79349b6e21acc53b77d9cc5b2.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 29f806e..832c514 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 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 * src/c++11/cxx11-shim_facets.cc: Suppress -Wabi warnings. diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc index f314502..a55cf89 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc @@ -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> @@ -28,12 +28,14 @@ void test02() { 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); string g = nump_it.grouping(); + // Ensure that grouping is empty for locales with empty thousands separator. VERIFY( g == "" ); } |