commit 0e30656b1cb3eb7e0bc0b12b7092c7f0b9293efa
author Stephan T. Lavavej <stl@nuwen.net> Sun Dec 10 07:28:17 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Sun Dec 10 07:32:30 2023 -0800
tree 45614541420506a01d089209cd8428f87b99faa4
parent 86c3f714d2b8f877827aead330fcf3b8dbdb3813

[libc++][test] Consistently use `TEST_SHORT_WCHAR` (#74958)

Found while running libc++'s test suite with MSVC's STL.

* In `escaped_output.unicode.pass.cpp`, replace `_LIBCPP_SHORT_WCHAR`
with `TEST_SHORT_WCHAR`.
+ This was the only test that was directly using the `_LIBCPP` macro.
`libcxx/test/support/test_macros.h` performs this mapping:
https://github.com/llvm/llvm-project/blob/c60ac509399da5cba533b9b6cc5b983c59f7d7b3/libcxx/test/support/test_macros.h#L442-L444
* In `msvc_stdlib_force_include.h`, define `TEST_SHORT_WCHAR`.

GitOrigin-RevId: 69a10e0e6af8ce4b4db88e307a21c8ca87add4af

test/std/utilities/format/format.functions/escaped_output.unicode.pass.cpp

diff --git a/test/std/utilities/format/format.functions/escaped_output.unicode.pass.cpp b/test/std/utilities/format/format.functions/escaped_output.unicode.pass.cpp
index 5c6f86f..23b2672 100644
--- a/test/std/utilities/format/format.functions/escaped_output.unicode.pass.cpp
+++ b/test/std/utilities/format/format.functions/escaped_output.unicode.pass.cpp
@@ -515,7 +515,7 @@
 }
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
-#  ifdef _LIBCPP_SHORT_WCHAR
+#  ifdef TEST_SHORT_WCHAR
 static void test_ill_formed_utf16() {
   using namespace std::literals;
 
@@ -543,7 +543,7 @@
               L"\xdbff"
               "a");
 }
-#  else // _LIBCPP_SHORT_WCHAR
+#  else // TEST_SHORT_WCHAR
 static void test_ill_formed_utf32() {
   using namespace std::literals;
 
@@ -552,7 +552,7 @@
   test_format(LR"("\x{ffffffff}")"sv, L"{:?}", L"\xffffffff"); // largest encoded code point
 }
 
-#  endif // _LIBCPP_SHORT_WCHAR
+#  endif // TEST_SHORT_WCHAR
 #endif   // TEST_HAS_NO_WIDE_CHARACTERS
 
 int main(int, char**) {
@@ -563,11 +563,11 @@
 
   test_ill_formed_utf8();
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
-#  ifdef _LIBCPP_SHORT_WCHAR
+#  ifdef TEST_SHORT_WCHAR
   test_ill_formed_utf16();
-#  else  // _LIBCPP_SHORT_WCHAR
+#  else  // TEST_SHORT_WCHAR
   test_ill_formed_utf32();
-#  endif // _LIBCPP_SHORT_WCHAR
+#  endif // TEST_SHORT_WCHAR
 #endif   // TEST_HAS_NO_WIDE_CHARACTERS
 
   return 0;

test/support/msvc_stdlib_force_include.h

diff --git a/test/support/msvc_stdlib_force_include.h b/test/support/msvc_stdlib_force_include.h
index b5ba33b..5742bbf 100644
--- a/test/support/msvc_stdlib_force_include.h
+++ b/test/support/msvc_stdlib_force_include.h
@@ -100,6 +100,8 @@
 #  define TEST_STD_VER 14
 #endif
 
+#define TEST_SHORT_WCHAR
+
 #define _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST
 
 #ifdef __clang__