https://github.com/cor3ntin created 
https://github.com/llvm/llvm-project/pull/207752

Fixes an Incorrectly applied merge conflict resolution after landing #206990

>From 091e2478e22124b87ade2e743fb97ebab3acc746 Mon Sep 17 00:00:00 2001
From: Corentin Jabot <[email protected]>
Date: Mon, 6 Jul 2026 17:07:24 +0200
Subject: [PATCH] Disable test not supported on MSVC

---
 clang/unittests/Basic/DiagnosticTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang/unittests/Basic/DiagnosticTest.cpp 
b/clang/unittests/Basic/DiagnosticTest.cpp
index 986eb058ece07..13553491397f2 100644
--- a/clang/unittests/Basic/DiagnosticTest.cpp
+++ b/clang/unittests/Basic/DiagnosticTest.cpp
@@ -452,7 +452,7 @@ TEST_F(SuppressionMappingTest, 
CanonicalizesSlashesOnWindows) {
 TEST(EscapeSingleCodepointForDiagnosticTest, printableDisplaysQuoted) {
   EXPECT_EQ(EscapeSingleCodepointForDiagnostic(U'A'), "'A'");
   // This test fails when msvc is not using /utf-8.
-  EXPECT_EQ(EscapeSingleCodepointForDiagnostic(U'🤡'), "'🤡' U+1F921");
+  // EXPECT_EQ(EscapeSingleCodepointForDiagnostic(U'🤡'), "'🤡' U+1F921");
   EXPECT_EQ(EscapeSingleCodepointForDiagnostic(U' '), "' '");
 }
 

_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to