[llvm-commits] [compiler-rt] r157464 - in /compiler-rt/trunk/lib/asan/output_tests: heap-overflow.cc strncpy-overflow.cc use-after-free.cc

[Dmitry Vyukov]

Author: dvyukov
Date: Fri May 25 04:46:33 2012
New Revision: 157464

URL: http://llvm.org/viewvc/llvm-project?rev=157464&view=rev
Log:
asan: fix tests
depending on -m32/-m64 addr2line says either e.g. __xsan_strnlen or just strnlen


Modified:
    compiler-rt/trunk/lib/asan/output_tests/heap-overflow.cc
    compiler-rt/trunk/lib/asan/output_tests/strncpy-overflow.cc
    compiler-rt/trunk/lib/asan/output_tests/use-after-free.cc

Modified: compiler-rt/trunk/lib/asan/output_tests/heap-overflow.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/output_tests/heap-overflow.cc?rev=157464&r1=157463&r2=157464&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/output_tests/heap-overflow.cc (original)
+++ compiler-rt/trunk/lib/asan/output_tests/heap-overflow.cc Fri May 25 04:46:33 2012
@@ -13,7 +13,7 @@
 // Check-Common: {{0x.* is located 0 bytes to the right of 10-byte region}}
 // Check-Common: {{allocated by thread T0 here:}}
 
-// Check-Linux: {{    #0 0x.* in __xsan_malloc}}
+// Check-Linux: {{    #0 0x.* in .*malloc}}
 // Check-Linux: {{    #1 0x.* in main .*heap-overflow.cc:[45]}}
 
 // Check-Darwin: {{    #0 0x.* in .*mz_malloc.*}}

Modified: compiler-rt/trunk/lib/asan/output_tests/strncpy-overflow.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/output_tests/strncpy-overflow.cc?rev=157464&r1=157463&r2=157464&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/output_tests/strncpy-overflow.cc (original)
+++ compiler-rt/trunk/lib/asan/output_tests/strncpy-overflow.cc Fri May 25 04:46:33 2012
@@ -9,13 +9,13 @@
 }
 
 // Check-Common: {{WRITE of size 1 at 0x.* thread T0}}
-// Check-Linux: {{    #0 0x.* in __xsan_strncpy}}
+// Check-Linux: {{    #0 0x.* in .*strncpy}}
 // Check-Darwin: {{    #0 0x.* in wrap_strncpy}}
 // Check-Common: {{    #1 0x.* in main .*strncpy-overflow.cc:[78]}}
 // Check-Common: {{0x.* is located 0 bytes to the right of 9-byte region}}
 // Check-Common: {{allocated by thread T0 here:}}
 
-// Check-Linux: {{    #0 0x.* in __xsan_malloc}}
+// Check-Linux: {{    #0 0x.* in .*malloc}}
 // Check-Linux: {{    #1 0x.* in main .*strncpy-overflow.cc:6}}
 
 // Check-Darwin: {{    #0 0x.* in .*mz_malloc.*}}

Modified: compiler-rt/trunk/lib/asan/output_tests/use-after-free.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/output_tests/use-after-free.cc?rev=157464&r1=157463&r2=157464&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/output_tests/use-after-free.cc (original)
+++ compiler-rt/trunk/lib/asan/output_tests/use-after-free.cc Fri May 25 04:46:33 2012
@@ -12,7 +12,7 @@
 // Check-Common: {{0x.* is located 5 bytes inside of 10-byte region .0x.*,0x.*}}
 // Check-Common: {{freed by thread T0 here:}}
 
-// Check-Linux: {{    #0 0x.* in __xsan_free}}
+// Check-Linux: {{    #0 0x.* in .*free}}
 // Check-Linux: {{    #1 0x.* in main .*use-after-free.cc:[45]}}
 
 // Check-Darwin: {{    #0 0x.* in .*mz_free.*}}
@@ -22,7 +22,7 @@
 
 // Check-Common: {{previously allocated by thread T0 here:}}
 
-// Check-Linux: {{    #0 0x.* in __xsan_malloc}}
+// Check-Linux: {{    #0 0x.* in .*malloc}}
 // Check-Linux: {{    #1 0x.* in main .*use-after-free.cc:3}}
 
 // Check-Darwin: {{    #0 0x.* in .*mz_malloc.*}}