From 60ba353ae9dcd74c58beb4d5971259666d316864 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Sat, 4 Jun 2016 08:54:57 +0000 Subject: Ok, now I know why I kept getting confused and not making progress fixing tis test. There are different configurations running, and they have subtly different backtraces. I didn't notice that the configs changed and so I kept occilating between the two. Now I've looked at two different configs at the same time, and so this should be much more likely to work. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@271786 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/asan/TestCases/Windows/intercept_strdup.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'test/asan/TestCases/Windows') diff --git a/test/asan/TestCases/Windows/intercept_strdup.cc b/test/asan/TestCases/Windows/intercept_strdup.cc index 8a816e1e9..aa077eca3 100644 --- a/test/asan/TestCases/Windows/intercept_strdup.cc +++ b/test/asan/TestCases/Windows/intercept_strdup.cc @@ -20,7 +20,13 @@ int main() { // CHECK: {{#0 .* main .*}}intercept_strdup.cc:[[@LINE-3]] // CHECK: [[ADDR]] is located 1 bytes to the left of 6-byte region // CHECK: allocated by thread T0 here: -// CHECK: #0 {{.*}} in __asan_wrap_strdup -// CHECK: #1 {{.*}} in main {{.*}}intercept_strdup.cc:[[@LINE-15]] +// +// The first frame is our wrapper normally but will be malloc in the dynamic +// config. +// CHECK: #0 {{.*}} in {{malloc|__asan_wrap_strdup}} +// +// The local call to _strdup above may be the second or third frame depending +// on whether we're using the dynamic config. +// CHECK: #{{[12]}} {{.*}} in main {{.*}}intercept_strdup.cc:[[@LINE-21] free(ptr); } -- cgit v1.2.3