[compiler-rt] r341632 - [libfuzzer] Enable trace-malloc-unballanced.test on Windows.

[Jonathan Metzman via llvm-commits]

Author: metzman
Date: Thu Sep  6 21:28:54 2018
New Revision: 341632

URL: http://llvm.org/viewvc/llvm-project?rev=341632&view=rev
Log:
[libfuzzer] Enable trace-malloc-unballanced.test on Windows.

Summary:
Enables trace-malloc-unbalanced.test on Windows, fixing two problems it had with Windows before.
The first fix is specifying python instead of relying on a script's shebang since they can't be used on Windows.
The second fix is making the regex tolerate windows' implementation of the "%p" format string.

Reviewers: Dor1s

Reviewed By: Dor1s

Subscribers: morehouse

Differential Revision: https://reviews.llvm.org/D51760

Modified:
    compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test

Modified: compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test?rev=341632&r1=341631&r2=341632&view=diff
==============================================================================
--- compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test (original)
+++ compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test Thu Sep  6 21:28:54 2018
@@ -1,20 +1,22 @@
 // FIXME: This test infinite loops on darwin because it crashes
 // printing a stack trace repeatedly
-// FIXME: Disabled on Windows because of reliance on shebang line and failure.
-UNSUPPORTED: darwin, windows
+UNSUPPORTED: darwin
 
 // Verifies lib/fuzzer/scripts/unbalanced_allocs.py script
 
 RUN: %cpp_compiler %S/TraceMallocTest.cpp -o %t-TraceMallocTest
 
+# Specify python because we can't use the shebang line on Windows.
 RUN: %run %t-TraceMallocTest -seed=1 -trace_malloc=1 -runs=200 2>&1 | \
-RUN:    %libfuzzer_src/scripts/unbalanced_allocs.py --skip=5 | FileCheck %s
+RUN:    python %libfuzzer_src/scripts/unbalanced_allocs.py --skip=5 | FileCheck %s
 
 RUN: %run %t-TraceMallocTest -seed=1 -trace_malloc=2 -runs=200 2>&1 | \
-RUN:    %libfuzzer_src/scripts/unbalanced_allocs.py --skip=5 | FileCheck %s --check-prefixes=CHECK,CHECK2
+RUN:    python %libfuzzer_src/scripts/unbalanced_allocs.py --skip=5 | FileCheck %s --check-prefixes=CHECK,CHECK2
 
 CHECK: MallocFreeTracer: START
-CHECK: Unbalanced MALLOC[{{[0-9]+}}] [[PTR:0x[0-9a-f]+]] 4
+# Behavior of the format string "%p" is implementation defined. Account for the
+# implementation on Windows and Linux.
+CHECK: Unbalanced MALLOC[{{[0-9]+}}] [[PTR:(:?0x)?[0-9a-fA-F]+]] 4
 CHECK2-NEXT: {{ #0 0x[0-9a-f]+ in }}
 CHECK2-NEXT: {{ #1 0x[0-9a-f]+ in }}
 CHECK2-NEXT: {{ #2 0x[0-9a-f]+ in }}