[compiler-rt] r219399 - [Tsan] Fix the signal_errno.cc and signal_malloc.cc tests to pass on FreeBSD

[Viktor Kutuzov]

Author: vkutuzov
Date: Thu Oct  9 04:40:02 2014
New Revision: 219399

URL: http://llvm.org/viewvc/llvm-project?rev=219399&view=rev
Log:
[Tsan] Fix the signal_errno.cc and signal_malloc.cc tests to pass on FreeBSD
Differential Revision: http://reviews.llvm.org/D5669

Modified:
    compiler-rt/trunk/test/tsan/signal_errno.cc
    compiler-rt/trunk/test/tsan/signal_malloc.cc

Modified: compiler-rt/trunk/test/tsan/signal_errno.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/signal_errno.cc?rev=219399&r1=219398&r2=219399&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/signal_errno.cc (original)
+++ compiler-rt/trunk/test/tsan/signal_errno.cc Thu Oct  9 04:40:02 2014
@@ -43,7 +43,7 @@ int main() {
 }
 
 // CHECK: WARNING: ThreadSanitizer: signal handler spoils errno
-// CHECK:     #0 MyHandler(int, siginfo{{(_t)?}}*, void*) {{.*}}signal_errno.cc
+// CHECK:     #0 MyHandler(int, {{(__)?}}siginfo{{(_t)?}}*, void*) {{.*}}signal_errno.cc
 // CHECK:     main
 // CHECK: SUMMARY: ThreadSanitizer: signal handler spoils errno{{.*}}MyHandler
 

Modified: compiler-rt/trunk/test/tsan/signal_malloc.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/signal_malloc.cc?rev=219399&r1=219398&r2=219399&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/signal_malloc.cc (original)
+++ compiler-rt/trunk/test/tsan/signal_malloc.cc Thu Oct  9 04:40:02 2014
@@ -8,7 +8,7 @@
 static void handler(int, siginfo_t*, void*) {
   // CHECK: WARNING: ThreadSanitizer: signal-unsafe call inside of a signal
   // CHECK:     #0 malloc
-  // CHECK:     #{{(1|2)}} handler(int, siginfo{{(_t)?}}*, void*) {{.*}}signal_malloc.cc:[[@LINE+2]]
+  // CHECK:     #{{(1|2)}} handler(int, {{(__)?}}siginfo{{(_t)?}}*, void*) {{.*}}signal_malloc.cc:[[@LINE+2]]
   // CHECK: SUMMARY: ThreadSanitizer: signal-unsafe call inside of a signal{{.*}}handler
   volatile char *p = (char*)malloc(1);
   p[0] = 0;