Skip to content

A
angle
Commit 1b5ad312 by Nico Weber Committed by Commit Bot
Options

Omit "de_DE.ISO-8859-15@euro" from ShCompileTest.DecimalSepLocale on Windows.

A new SDK version started throwing on locales that have a code page section (the part after the dot) that's >= 16 characters long. That's a system library bug, but for now we need to work around it. Bug: chromium:972372 Change-Id: I64cee1051e854dac84e8c3c728ce65606b0dc89b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1652016 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 28394c22
Showing with 32 additions and 8 deletions
src/tests/compiler_tests/ShCompile_test.cpp
...@@ -143,14 +143,39 @@ TEST_F(ShCompileTest, DecimalSepLocale) ...@@ -143,14 +143,39 @@ TEST_F(ShCompileTest, DecimalSepLocale)
{ {
// Locale names are platform dependent, add platform-specific names of locales to be tested here // Locale names are platform dependent, add platform-specific names of locales to be tested here
const std::string availableLocales[] = { const std::string availableLocales[] = {
"de_DE", "de-DE", "de_DE.UTF-8", "de_DE.ISO8859-1", "de_DE.ISO8859-15", "de_DE@euro", "de_DE",
"de_DE.88591", "de_DE.88591.en", "de_DE.iso88591", "de_DE.ISO-8859-1", "de_DE.ISO_8859-1", "de-DE",
"de_DE.iso885915", "de_DE.ISO-8859-15", "de_DE.ISO_8859-15", "de_DE.8859-15", "de_DE.UTF-8",
"de_DE.8859-15@euro", "de_DE.ISO-8859-15@euro", "de_DE.UTF-8@euro", "de_DE.utf8", "de_DE.ISO8859-1",
"German_germany", "German_Germany", "German_Germany.1252", "German_Germany.UTF-8", "German", "de_DE.ISO8859-15",
"de_DE@euro",
"de_DE.88591",
"de_DE.88591.en",
"de_DE.iso88591",
"de_DE.ISO-8859-1",
"de_DE.ISO_8859-1",
"de_DE.iso885915",
"de_DE.ISO-8859-15",
"de_DE.ISO_8859-15",
"de_DE.8859-15",
"de_DE.8859-15@euro",
#if !defined(_WIN32)
// TODO(https://crbug.com/972372): Add this test back on Windows once the
// CRT no longer throws on code page sections ('ISO-8859-15@euro') that
// are >= 16 characters long.
"de_DE.ISO-8859-15@euro",
#endif
"de_DE.UTF-8@euro",
"de_DE.utf8",
"German_germany",
"German_Germany",
"German_Germany.1252",
"German_Germany.UTF-8",
"German",
// One ubuntu tester doesn't have a german locale, but da_DK.utf8 has similar float // One ubuntu tester doesn't have a german locale, but da_DK.utf8 has similar float
// representation // representation
"da_DK.utf8"}; "da_DK.utf8"
};
const auto localeExists = [](const std::string name) { const auto localeExists = [](const std::string name) {
return bool(setlocale(LC_ALL, name.c_str())); return bool(setlocale(LC_ALL, name.c_str()));
...@@ -200,4 +225,4 @@ TEST_F(ShCompileTest, DecimalSepLocale) ...@@ -200,4 +225,4 @@ TEST_F(ShCompileTest, DecimalSepLocale)
testedLocales++; testedLocales++;
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment