[compiler-rt] 9faa623 - [compiler-rt] [test] Work around MS CRT stdio format quirks on mingw too (#93787)

[via llvm-commits]

Author: Martin Storsjö
Date: 2024-05-30T22:46:37+03:00
New Revision: 9faa623d96baa39fe109a74ff903c568c7a6782b

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

LOG: [compiler-rt] [test] Work around MS CRT stdio format quirks on mingw too (#93787)

So far, these tests have been disabled in mingw build configurations
(built as asan-dynamic), but these were enabled in
246234ac70faa1e3281a2bb83dfc4dd206a7d59c, exposing the issue.

(That commit is currently reverted, but will probably be relanded in
some form soon.)

Added: 
    

Modified: 
    compiler-rt/test/asan/TestCases/debug_double_free.cpp
    compiler-rt/test/asan/TestCases/debug_report.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/asan/TestCases/debug_double_free.cpp b/compiler-rt/test/asan/TestCases/debug_double_free.cpp
index de5ac7b0c8d5c..d7c59f8b41236 100644
--- a/compiler-rt/test/asan/TestCases/debug_double_free.cpp
+++ b/compiler-rt/test/asan/TestCases/debug_double_free.cpp
@@ -7,9 +7,9 @@
 // FIXME: Doesn't work with DLLs
 // XFAIL: win32-dynamic-asan
 
-// If we use %p with MSVC, it comes out all upper case. Use %08x to get
+// If we use %p with MS CRTs, it comes out all upper case. Use %08x to get
 // lowercase hex.
-#ifdef _MSC_VER
+#ifdef _WIN32
 # ifdef _WIN64
 #  define PTR_FMT "0x%08llx"
 # else

diff  --git a/compiler-rt/test/asan/TestCases/debug_report.cpp b/compiler-rt/test/asan/TestCases/debug_report.cpp
index 617b7ee91e18d..d02ce50312226 100644
--- a/compiler-rt/test/asan/TestCases/debug_report.cpp
+++ b/compiler-rt/test/asan/TestCases/debug_report.cpp
@@ -22,9 +22,9 @@ int main() {
   return 0;
 }
 
-// If we use %p with MSVC, it comes out all upper case. Use %08x to get
+// If we use %p with MS CRTs, it comes out all upper case. Use %08x to get
 // lowercase hex.
-#ifdef _MSC_VER
+#ifdef _WIN32
 # ifdef _WIN64
 #  define PTR_FMT "0x%08llx"
 # else