[PATCH] D14873: [tsan] Modify the tls_race.cc and tls_race2.cc tests to pass on OS X

[Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL253858: [tsan] Modify the tls_race.cc and tls_race2.cc tests to pass on OS X (authored by kuba.brecka).

Changed prior to commit:
  http://reviews.llvm.org/D14873?vs=40884&id=40902#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D14873

Files:
  compiler-rt/trunk/test/tsan/tls_race.cc
  compiler-rt/trunk/test/tsan/tls_race2.cc

Index: compiler-rt/trunk/test/tsan/tls_race2.cc
===================================================================
--- compiler-rt/trunk/test/tsan/tls_race2.cc
+++ compiler-rt/trunk/test/tsan/tls_race2.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s --check-prefix=CHECK-%os --check-prefix=CHECK
 #include "test.h"
 
 void *Thread2(void *a) {
@@ -25,5 +25,6 @@
 }
 
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK:   Location is TLS of thread T1.
-
+// CHECK-Linux:   Location is TLS of thread T1.
+// CHECK-FreeBSD:   Location is TLS of thread T1.
+// CHECK-Darwin:   Location is heap block of size 4
Index: compiler-rt/trunk/test/tsan/tls_race.cc
===================================================================
--- compiler-rt/trunk/test/tsan/tls_race.cc
+++ compiler-rt/trunk/test/tsan/tls_race.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s --check-prefix=CHECK-%os --check-prefix=CHECK
 #include "test.h"
 
 void *Thread(void *a) {
@@ -18,4 +18,6 @@
 }
 
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK:   Location is TLS of main thread.
+// CHECK-Linux:   Location is TLS of main thread.
+// CHECK-FreeBSD:   Location is TLS of main thread.
+// CHECK-Darwin:   Location is heap block of size 4


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14873.40902.patch
Type: text/x-patch
Size: 1450 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151123/c5bb6a00/attachment.bin>