[llvm-branch-commits] [libcxx] 003a3b0 - [libc++] Fixes lit portability issues. (#72435)

[via llvm-branch-commits]

Author: Mark de Wever
Date: 2023-11-16T17:56:34-05:00
New Revision: 003a3b04b0889bfb3bd0719f80323f8e879c05fe

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

LOG: [libc++] Fixes lit portability issues. (#72435)

@StephanTLavavej mentioned the libc++ tests no longer works for MSVC
STL. The regex changes have been provided by Stephan.

Added: 
    

Modified: 
    libcxx/utils/libcxx/test/params.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py
index e31130572df6576..3fedbf972c0c822 100644
--- a/libcxx/utils/libcxx/test/params.py
+++ b/libcxx/utils/libcxx/test/params.py
@@ -114,7 +114,7 @@ def getStdFlag(cfg, std):
         ),
         actions=lambda std: [
             AddFeature(std),
-            AddSubstitution("%{cxx_std}", re.sub("\+", "x", std)),
+            AddSubstitution("%{cxx_std}", re.sub(r"\+", "x", std)),
             AddCompileFlag(lambda cfg: getStdFlag(cfg, std)),
         ],
     ),
@@ -187,7 +187,7 @@ def getStdFlag(cfg, std):
                 AddFeature("stdlib={}".format(stdlib)),
                 # Also add an umbrella feature 'stdlib=libc++' for all flavors of libc++, to simplify
                 # the test suite.
-                AddFeature("stdlib=libc++") if re.match(".+-libc\+\+", stdlib) else None,
+                AddFeature("stdlib=libc++") if re.match(r".+-libc\+\+", stdlib) else None,
             ],
         ),
     ),