[compiler-rt] r173913 - [TSan] relax output tests a bit to make them pass in gcc build

[Alexey Samsonov]

Author: samsonov
Date: Wed Jan 30 02:41:57 2013
New Revision: 173913

URL: http://llvm.org/viewvc/llvm-project?rev=173913&view=rev
Log:
[TSan] relax output tests a bit to make them pass in gcc build

Modified:
    compiler-rt/trunk/lib/tsan/lit_tests/free_race.c
    compiler-rt/trunk/lib/tsan/lit_tests/free_race2.c
    compiler-rt/trunk/lib/tsan/lit_tests/race_on_heap.cc
    compiler-rt/trunk/lib/tsan/lit_tests/signal_malloc.cc

Modified: compiler-rt/trunk/lib/tsan/lit_tests/free_race.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/free_race.c?rev=173913&r1=173912&r2=173913&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/free_race.c (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/free_race.c Wed Jan 30 02:41:57 2013
@@ -40,4 +40,4 @@ int main() {
 // CHECK:     #1 main
 // CHECK:   Previous write of size 8 at {{.*}} by thread T1{{.*}}:
 // CHECK:     #0 free
-// CHECK:     #1 Thread1
+// CHECK:     #{{(1|2)}} Thread1

Modified: compiler-rt/trunk/lib/tsan/lit_tests/free_race2.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/free_race2.c?rev=173913&r1=173912&r2=173913&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/free_race2.c (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/free_race2.c Wed Jan 30 02:41:57 2013
@@ -22,5 +22,5 @@ int main() {
 // CHECK:     #1 main
 // CHECK:   Previous write of size 8 at {{.*}} by main thread:
 // CHECK:     #0 free
-// CHECK:     #1 foo
-// CHECK:     #2 main
+// CHECK:     #{{1|2}} foo
+// CHECK:     #{{2|3}} main

Modified: compiler-rt/trunk/lib/tsan/lit_tests/race_on_heap.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/race_on_heap.cc?rev=173913&r1=173912&r2=173913&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/race_on_heap.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/race_on_heap.cc Wed Jan 30 02:41:57 2013
@@ -39,8 +39,8 @@ int main() {
 // ...
 // CHECK: Location is heap block of size 99 at [[ADDR]] allocated by thread T1:
 // CHCEKL     #0 malloc
-// CHECK:     #1 alloc
-// CHECK:     #2 AllocThread
+// CHECK:     #{{1|2}} alloc
+// CHECK:     #{{2|3}} AllocThread
 // ...
 // CHECK:   Thread T1 (tid={{.*}}, finished) created by main thread at:
 // CHECK:     #0 pthread_create

Modified: compiler-rt/trunk/lib/tsan/lit_tests/signal_malloc.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/signal_malloc.cc?rev=173913&r1=173912&r2=173913&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/signal_malloc.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/signal_malloc.cc Wed Jan 30 02:41:57 2013
@@ -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 handler(int, siginfo{{(_t)?}}*, void*) {{.*}}signal_malloc.cc:[[@LINE+1]]
+  // CHECK:     #{{(1|2)}} handler(int, siginfo{{(_t)?}}*, void*) {{.*}}signal_malloc.cc:[[@LINE+1]]
   volatile char *p = (char*)malloc(1);
   p[0] = 0;
   free((void*)p);