From 3bd385c6f182169886bec74afd1115df10b95b80 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 17 Oct 2019 17:59:11 +0000 Subject: [asan] Update Windows test expectations for LLVM's MS demangler After r375041 llvm-symbolizer uses it for demangling instead of UnDecorateSymbolName. LLVM puts spaces after commas while Microsoft does not. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@375147 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/asan/TestCases/Windows/demangled_names.cpp | 2 +- test/asan/TestCases/invalid-pointer-pairs.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/asan/TestCases/Windows/demangled_names.cpp b/test/asan/TestCases/Windows/demangled_names.cpp index 1e655b43d..f6325f364 100644 --- a/test/asan/TestCases/Windows/demangled_names.cpp +++ b/test/asan/TestCases/Windows/demangled_names.cpp @@ -45,6 +45,6 @@ int main() { // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]] // CHECK: foo::bar<42>{{.*}}demangled_names.cpp // CHECK: foo::spam{{.*}}demangled_names.cpp -// CHECK: baz{{.*}}demangled_names.cpp +// CHECK: baz{{.*}}demangled_names.cpp // CHECK: A::~A{{.*}}demangled_names.cpp } diff --git a/test/asan/TestCases/invalid-pointer-pairs.cpp b/test/asan/TestCases/invalid-pointer-pairs.cpp index 8e57bdc0c..accd9b770 100644 --- a/test/asan/TestCases/invalid-pointer-pairs.cpp +++ b/test/asan/TestCases/invalid-pointer-pairs.cpp @@ -13,10 +13,10 @@ int f(char c, char *p, char *q) { // [[PTR1:0x[0-9a-f]+]] [[PTR2:0x[0-9a-f]+]] switch (c) { case 'g': - // CMP: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cpp:[[@LINE+1]] + // CMP: #{{[0-9]+ .*}} in f({{char, *char *\*, *char *\*}}) {{.*}}invalid-pointer-pairs.cpp:[[@LINE+1]] return p > q; case 's': - // SUB: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cpp:[[@LINE+1]] + // SUB: #{{[0-9]+ .*}} in f({{char, *char *\*, *char *\*}}) {{.*}}invalid-pointer-pairs.cpp:[[@LINE+1]] return p - q; case 'k': { // OK-NOT: ERROR @@ -26,7 +26,7 @@ int f(char c, char *p, char *q) { case 'f': { char *p3 = p + 20; free(p); - // FREE: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cpp:[[@LINE+2]] + // FREE: #{{[0-9]+ .*}} in f({{char, *char *\*, *char *\*}}) {{.*}}invalid-pointer-pairs.cpp:[[@LINE+2]] // FREE: freed by thread return p < p3; } -- cgit v1.2.1