LGTM!<div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Jul 4, 2012 at 7:48 PM, Alexey Samsonov <span dir="ltr"><<a href="mailto:samsonov@google.com" target="_blank">samsonov@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: samsonov<br>
Date: Wed Jul  4 10:48:05 2012<br>
New Revision: 159714<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=159714&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=159714&view=rev</a><br>
Log:<br>
[TSan] Improve output tests: allow reports to contain file:line:column instead of file:line<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/tsan/output_tests/race_on_mutex.c<br>
    compiler-rt/trunk/lib/tsan/output_tests/simple_stack.c<br>
    compiler-rt/trunk/lib/tsan/output_tests/simple_stack2.cc<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/output_tests/race_on_mutex.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/output_tests/race_on_mutex.c?rev=159714&r1=159713&r2=159714&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/output_tests/race_on_mutex.c?rev=159714&r1=159713&r2=159714&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/output_tests/race_on_mutex.c (original)<br>
+++ compiler-rt/trunk/lib/tsan/output_tests/race_on_mutex.c Wed Jul  4 10:48:05 2012<br>
@@ -35,8 +35,7 @@<br>
 // CHECK:      WARNING: ThreadSanitizer: data race<br>
 // CHECK-NEXT:   Read of size 1 at {{.*}} by thread 2:<br>
 // CHECK-NEXT:     #0 pthread_mutex_lock {{.*}} ({{.*}})<br>
-// CHECK-NEXT:     #1 Thread2 {{.*}}race_on_mutex.c:19 ({{.*}})<br>
+// CHECK-NEXT:     #1 Thread2 {{.*}}race_on_mutex.c:19{{(:3)?}} ({{.*}})<br>
 // CHECK-NEXT:   Previous write of size 1 at {{.*}} by thread 1:<br>
 // CHECK-NEXT:     #0 pthread_mutex_init {{.*}} ({{.*}})<br>
-// CHECK-NEXT:     #1 Thread1 {{.*}}race_on_mutex.c:10 ({{.*}})<br>
-<br>
+// CHECK-NEXT:     #1 Thread1 {{.*}}race_on_mutex.c:10{{(:3)?}} ({{.*}})<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/output_tests/simple_stack.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/output_tests/simple_stack.c?rev=159714&r1=159713&r2=159714&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/output_tests/simple_stack.c?rev=159714&r1=159713&r2=159714&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/output_tests/simple_stack.c (original)<br>
+++ compiler-rt/trunk/lib/tsan/output_tests/simple_stack.c Wed Jul  4 10:48:05 2012<br>
@@ -48,19 +48,18 @@<br>
<br>
 // CHECK:      WARNING: ThreadSanitizer: data race<br>
 // CHECK-NEXT:   Write of size 4 at {{.*}} by thread 1:<br>
-// CHECK-NEXT:     #0 foo1 {{.*}}simple_stack.c:8 ({{.*}})<br>
-// CHECK-NEXT:     #1 bar1 {{.*}}simple_stack.c:13 ({{.*}})<br>
-// CHECK-NEXT:     #2 Thread1 {{.*}}simple_stack.c:27 ({{.*}})<br>
+// CHECK-NEXT:     #0 foo1 {{.*}}simple_stack.c:8{{(:3)?}} ({{.*}})<br>
+// CHECK-NEXT:     #1 bar1 {{.*}}simple_stack.c:13{{(:3)?}} ({{.*}})<br>
+// CHECK-NEXT:     #2 Thread1 {{.*}}simple_stack.c:27{{(:3)?}} ({{.*}})<br>
 // CHECK-NEXT:   Previous read of size 4 at {{.*}} by thread 2:<br>
-// CHECK-NEXT:     #0 foo2 {{.*}}simple_stack.c:17 ({{.*}})<br>
-// CHECK-NEXT:     #1 bar2 {{.*}}simple_stack.c:22 ({{.*}})<br>
-// CHECK-NEXT:     #2 Thread2 {{.*}}simple_stack.c:32 ({{.*}})<br>
+// CHECK-NEXT:     #0 foo2 {{.*}}simple_stack.c:17{{(:26)?}} ({{.*}})<br>
+// CHECK-NEXT:     #1 bar2 {{.*}}simple_stack.c:22{{(:3)?}} ({{.*}})<br>
+// CHECK-NEXT:     #2 Thread2 {{.*}}simple_stack.c:32{{(:3)?}} ({{.*}})<br>
 // CHECK-NEXT:   Thread 1 (running) created at:<br>
 // CHECK-NEXT:     #0 pthread_create {{.*}} ({{.*}})<br>
-// CHECK-NEXT:     #1 StartThread {{.*}}simple_stack.c:37 ({{.*}})<br>
-// CHECK-NEXT:     #2 main {{.*}}simple_stack.c:42 ({{.*}})<br>
+// CHECK-NEXT:     #1 StartThread {{.*}}simple_stack.c:37{{(:3)?}} ({{.*}})<br>
+// CHECK-NEXT:     #2 main {{.*}}simple_stack.c:42{{(:3)?}} ({{.*}})<br>
 // CHECK-NEXT:   Thread 2 ({{.*}}) created at:<br>
 // CHECK-NEXT:     #0 pthread_create {{.*}} ({{.*}})<br>
-// CHECK-NEXT:     #1 StartThread {{.*}}simple_stack.c:37 ({{.*}})<br>
-// CHECK-NEXT:     #2 main {{.*}}simple_stack.c:43 ({{.*}})<br>
-<br>
+// CHECK-NEXT:     #1 StartThread {{.*}}simple_stack.c:37{{(:3)?}} ({{.*}})<br>
+// CHECK-NEXT:     #2 main {{.*}}simple_stack.c:43{{(:3)?}} ({{.*}})<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/output_tests/simple_stack2.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/output_tests/simple_stack2.cc?rev=159714&r1=159713&r2=159714&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/output_tests/simple_stack2.cc?rev=159714&r1=159713&r2=159714&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/output_tests/simple_stack2.cc (original)<br>
+++ compiler-rt/trunk/lib/tsan/output_tests/simple_stack2.cc Wed Jul  4 10:48:05 2012<br>
@@ -37,12 +37,10 @@<br>
<br>
 // CHECK:      WARNING: ThreadSanitizer: data race<br>
 // CHECK-NEXT:   Write of size 4 at {{.*}} by thread 1:<br>
-// CHECK-NEXT:     #0 foo1{{.*}} {{.*}}simple_stack2.cc:8 ({{.*}})<br>
-// CHECK-NEXT:     #1 bar1{{.*}} {{.*}}simple_stack2.cc:13 ({{.*}})<br>
-// CHECK-NEXT:     #2 Thread1{{.*}} {{.*}}simple_stack2.cc:27 ({{.*}})<br>
+// CHECK-NEXT:     #0 foo1{{.*}} {{.*}}simple_stack2.cc:8{{(:3)?}} ({{.*}})<br>
+// CHECK-NEXT:     #1 bar1{{.*}} {{.*}}simple_stack2.cc:13{{(:3)?}} ({{.*}})<br>
+// CHECK-NEXT:     #2 Thread1{{.*}} {{.*}}simple_stack2.cc:27{{(:3)?}} ({{.*}})<br>
 // CHECK-NEXT:   Previous read of size 4 at {{.*}} by main thread:<br>
-// CHECK-NEXT:     #0 foo2{{.*}} {{.*}}simple_stack2.cc:17 ({{.*}})<br>
-// CHECK-NEXT:     #1 bar2{{.*}} {{.*}}simple_stack2.cc:22 ({{.*}})<br>
-// CHECK-NEXT:     #2 main{{.*}} {{.*}}simple_stack2.cc:34 ({{.*}})<br>
-<br>
-<br>
+// CHECK-NEXT:     #0 foo2{{.*}} {{.*}}simple_stack2.cc:17{{(:28)?}} ({{.*}})<br>
+// CHECK-NEXT:     #1 bar2{{.*}} {{.*}}simple_stack2.cc:22{{(:3)?}} ({{.*}})<br>
+// CHECK-NEXT:     #2 main{{.*}} {{.*}}simple_stack2.cc:34{{(:3)?}} ({{.*}})<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>