diff options
| -rw-r--r-- | compiler-rt/test/asan/TestCases/Windows/coverage-basic.cc | 4 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/coverage-reset.cc | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/compiler-rt/test/asan/TestCases/Windows/coverage-basic.cc b/compiler-rt/test/asan/TestCases/Windows/coverage-basic.cc index 0ff105d1624..918872f18f9 100644 --- a/compiler-rt/test/asan/TestCases/Windows/coverage-basic.cc +++ b/compiler-rt/test/asan/TestCases/Windows/coverage-basic.cc @@ -6,8 +6,8 @@ // RUN: %sancov print *.sancov | FileCheck %s #include <stdio.h> -void foo() { fprintf(stderr, "FOO\n"); } -void bar() { fprintf(stderr, "BAR\n"); } +void foo() { fputs("FOO", stderr); } +void bar() { fputs("BAR", stderr); } int main(int argc, char **argv) { if (argc == 2) { diff --git a/compiler-rt/test/asan/TestCases/coverage-reset.cc b/compiler-rt/test/asan/TestCases/coverage-reset.cc index eb8da8c1aa0..11c5ef66ecf 100644 --- a/compiler-rt/test/asan/TestCases/coverage-reset.cc +++ b/compiler-rt/test/asan/TestCases/coverage-reset.cc @@ -13,6 +13,13 @@ static volatile int sink; __attribute__((noinline)) void bar() { sink = 2; } __attribute__((noinline)) void foo() { sink = 1; } +// In MSVC 2015, printf is an inline function, which causes this test to fail as +// it introduces an extra coverage point. Define away printf on that platform to +// avoid the issue. +#if _MSC_VER >= 1900 +# define printf(arg, ...) +#endif + #define GET_AND_PRINT_COVERAGE() \ bitset = 0; \ for (size_t i = 0; i < n_guards; i++) \ |
