[compiler-rt] r302045 - Revert my bad winasan coverage test fix and apply one that actually works

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Wed May  3 11:11:01 2017
New Revision: 302045

URL: http://llvm.org/viewvc/llvm-project?rev=302045&view=rev
Log:
Revert my bad winasan coverage test fix and apply one that actually works

trace-pc doesn't work, but trace-pc-guard does. *shrug*

Modified:
    compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc
    compiler-rt/trunk/test/asan/TestCases/Windows/coverage-dll-stdio.cc

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc?rev=302045&r1=302044&r2=302045&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc Wed May  3 11:11:01 2017
@@ -1,6 +1,6 @@
 // RUN: rm -rf %T/coverage-basic
 // RUN: mkdir %T/coverage-basic && cd %T/coverage-basic
-// RUN: %clangxx_asan -fsanitize-coverage=func,trace-pc %s -o test.exe
+// RUN: %clangxx_asan -fsanitize-coverage=func %s -o test.exe
 // RUN: %env_asan_opts=coverage=1 %run ./test.exe
 //
 // RUN: %sancov print *.sancov | FileCheck %s

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/coverage-dll-stdio.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/coverage-dll-stdio.cc?rev=302045&r1=302044&r2=302045&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/coverage-dll-stdio.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/coverage-dll-stdio.cc Wed May  3 11:11:01 2017
@@ -2,8 +2,8 @@
 // __local_stdio_printf_options function isn't instrumented for coverage.
 
 // RUN: rm -rf %t && mkdir %t && cd %t
-// RUN: %clang_cl_asan -fsanitize-coverage=func -O0 %p/dll_host.cc -Fet.exe
-// RUN: %clang_cl_asan -fsanitize-coverage=func -LD -O0 %s -Fet.dll
+// RUN: %clang_cl_asan -fsanitize-coverage=func,trace-pc-guard -O0 %p/dll_host.cc -Fet.exe
+// RUN: %clang_cl_asan -fsanitize-coverage=func,trace-pc-guard -LD -O0 %s -Fet.dll
 // RUN: %run ./t.exe t.dll 2>&1 | FileCheck %s
 
 #include <stdio.h>