[compiler-rt] r288067 - [asan] Attempt to fix the debug_double_free.cc testcase on Windows after r288065.

[Kuba Mracek via llvm-commits]

Author: kuba.brecka
Date: Mon Nov 28 15:28:41 2016
New Revision: 288067

URL: http://llvm.org/viewvc/llvm-project?rev=288067&view=rev
Log:
[asan] Attempt to fix the debug_double_free.cc testcase on Windows after r288065.


Modified:
    compiler-rt/trunk/test/asan/TestCases/debug_double_free.cc

Modified: compiler-rt/trunk/test/asan/TestCases/debug_double_free.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/debug_double_free.cc?rev=288067&r1=288066&r2=288067&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/debug_double_free.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/debug_double_free.cc Mon Nov 28 15:28:41 2016
@@ -4,11 +4,29 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+// 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
+// lowercase hex.
+#ifdef _MSC_VER
+# ifdef _WIN64
+#  define PTR_FMT "0x%08llx"
+# else
+#  define PTR_FMT "0x%08x"
+# endif
+#else
+# define PTR_FMT "%p"
+#endif
+
 char *heap_ptr;
 
 int main() {
+  // Disable stderr buffering. Needed on Windows.
+  setvbuf(stderr, NULL, _IONBF, 0);
+
   heap_ptr = (char *)malloc(10);
-  fprintf(stderr, "heap_ptr: %p\n", heap_ptr);
+  fprintf(stderr, "heap_ptr: " PTR_FMT "\n", heap_ptr);
   // CHECK: heap_ptr: 0x[[ADDR:[0-9a-f]+]]
 
   free(heap_ptr);
@@ -23,7 +41,7 @@ void __asan_on_error() {
 
   fprintf(stderr, "%s\n", (present == 1) ? "report present" : "");
   // CHECK: report present
-  fprintf(stderr, "addr: %p\n", addr);
+  fprintf(stderr, "addr: " PTR_FMT "\n", addr);
   // CHECK: addr: {{0x0*}}[[ADDR]]
   fprintf(stderr, "description: %s\n", description);
   // CHECK: description: double-free