[libcxx-commits] [libcxx] eb4dcc7 - [libcxx] [test] Add a 'win32-' prefix to the 'broken-utf8-wchar-ctype' feature

[Martin Storsjö via libcxx-commits]

Author: Martin Storsjö
Date: 2022-03-01T21:33:30+02:00
New Revision: eb4dcc744d5ca7ce59751cab9a303db587341960

URL: https://github.com/llvm/llvm-project/commit/eb4dcc744d5ca7ce59751cab9a303db587341960
DIFF: https://github.com/llvm/llvm-project/commit/eb4dcc744d5ca7ce59751cab9a303db587341960.diff

LOG: [libcxx] [test] Add a 'win32-' prefix to the 'broken-utf8-wchar-ctype' feature

This was suggested in the review of https://reviews.llvm.org/D120022.

Also indent the code for the compilation test one step compared
to the surrounding expression.

Differential Revision: https://reviews.llvm.org/D120469

Added: 
    

Modified: 
    libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
    libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
    libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
    libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
    libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
    libcxx/utils/libcxx/test/features.py

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
index 5e2b81d06e5a..49b56aa9312c 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: locale.en_US.UTF-8
-// XFAIL: broken-utf8-wchar-ctype
+// XFAIL: win32-broken-utf8-wchar-ctype
 
 // <locale>
 

diff  --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
index 289d569ab9fb..952dcf4a6b01 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: locale.en_US.UTF-8
-// XFAIL: broken-utf8-wchar-ctype
+// XFAIL: win32-broken-utf8-wchar-ctype
 
 // <locale>
 

diff  --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
index d957e1ee0991..24f8b3d93b65 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: locale.en_US.UTF-8
-// XFAIL: broken-utf8-wchar-ctype
+// XFAIL: win32-broken-utf8-wchar-ctype
 
 // <locale>
 

diff  --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
index 7893a32204a9..f5077634257f 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: locale.en_US.UTF-8
-// XFAIL: broken-utf8-wchar-ctype
+// XFAIL: win32-broken-utf8-wchar-ctype
 
 // <locale>
 

diff  --git a/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp b/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
index 257c627f20ee..1048e585973d 100644
--- a/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
+++ b/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
@@ -13,7 +13,7 @@
 // charT translate_nocase(charT c) const;
 
 // REQUIRES: locale.en_US.UTF-8
-// XFAIL: broken-utf8-wchar-ctype
+// XFAIL: win32-broken-utf8-wchar-ctype
 
 #include <regex>
 #include <cassert>

diff  --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py
index a2498cada94b..e98d759dfc2b 100644
--- a/libcxx/utils/libcxx/test/features.py
+++ b/libcxx/utils/libcxx/test/features.py
@@ -75,14 +75,14 @@
 
   # Check for a Windows UCRT bug (fixed in UCRT/Windows 10.0.20348.0):
   # https://developercommunity.visualstudio.com/t/utf-8-locales-break-ctype-functions-for-wchar-type/1653678
-  Feature(name='broken-utf8-wchar-ctype',
+  Feature(name='win32-broken-utf8-wchar-ctype',
           when=lambda cfg: '_WIN32' in compilerMacros(cfg) and not programSucceeds(cfg, """
-          #include <locale.h>
-          #include <wctype.h>
-          int main(int, char**) {
-            setlocale(LC_ALL, "en_US.UTF-8");
-            return towlower(L'\\xDA') != L'\\xFA';
-          }
+            #include <locale.h>
+            #include <wctype.h>
+            int main(int, char**) {
+              setlocale(LC_ALL, "en_US.UTF-8");
+              return towlower(L'\\xDA') != L'\\xFA';
+            }
           """)),
 
   # Whether Bash can run on the executor.