[compiler-rt] r253075 - [tsan] Don't require full paths to be present on stack traces
Kuba Brecka via llvm-commits
llvm-commits at lists.llvm.org
Fri Nov 13 12:36:08 PST 2015
Author: kuba.brecka
Date: Fri Nov 13 14:36:08 2015
New Revision: 253075
URL: http://llvm.org/viewvc/llvm-project?rev=253075&view=rev
Log:
[tsan] Don't require full paths to be present on stack traces
The OS X symbolizers (namely AtosSymbolizer) don't return full file paths, only file names. This patch modifies `mutexset*.cc` tests not to require a path to be present in the symbol on the stack trace.
Differential Revision: http://reviews.llvm.org/D14642
Modified:
compiler-rt/trunk/test/tsan/mutexset1.cc
compiler-rt/trunk/test/tsan/mutexset2.cc
compiler-rt/trunk/test/tsan/mutexset3.cc
compiler-rt/trunk/test/tsan/mutexset4.cc
compiler-rt/trunk/test/tsan/mutexset5.cc
compiler-rt/trunk/test/tsan/mutexset6.cc
compiler-rt/trunk/test/tsan/mutexset8.cc
Modified: compiler-rt/trunk/test/tsan/mutexset1.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/mutexset1.cc?rev=253075&r1=253074&r2=253075&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/mutexset1.cc (original)
+++ compiler-rt/trunk/test/tsan/mutexset1.cc Fri Nov 13 14:36:08 2015
@@ -26,7 +26,7 @@ int main() {
// CHECK: Previous write of size 4 at {{.*}} by thread T2:
// CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init
- // CHECK: #1 main {{.*}}/mutexset1.cc:[[@LINE+1]]
+ // CHECK: #1 main {{.*}}mutexset1.cc:[[@LINE+1]]
pthread_mutex_init(&mtx, 0);
pthread_t t[2];
pthread_create(&t[0], NULL, Thread1, NULL);
Modified: compiler-rt/trunk/test/tsan/mutexset2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/mutexset2.cc?rev=253075&r1=253074&r2=253075&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/mutexset2.cc (original)
+++ compiler-rt/trunk/test/tsan/mutexset2.cc Fri Nov 13 14:36:08 2015
@@ -26,7 +26,7 @@ int main() {
// CHECK: (mutexes: write [[M1:M[0-9]+]]):
// CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init
- // CHECK: #1 main {{.*}}/mutexset2.cc:[[@LINE+1]]
+ // CHECK: #1 main {{.*}}mutexset2.cc:[[@LINE+1]]
pthread_mutex_init(&mtx, 0);
pthread_t t[2];
pthread_create(&t[0], NULL, Thread1, NULL);
Modified: compiler-rt/trunk/test/tsan/mutexset3.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/mutexset3.cc?rev=253075&r1=253074&r2=253075&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/mutexset3.cc (original)
+++ compiler-rt/trunk/test/tsan/mutexset3.cc Fri Nov 13 14:36:08 2015
@@ -29,10 +29,10 @@ int main() {
// CHECK: Previous write of size 4 at {{.*}} by thread T2:
// CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init
- // CHECK: #1 main {{.*}}/mutexset3.cc:[[@LINE+4]]
+ // CHECK: #1 main {{.*}}mutexset3.cc:[[@LINE+4]]
// CHECK: Mutex [[M2]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init
- // CHECK: #1 main {{.*}}/mutexset3.cc:[[@LINE+2]]
+ // CHECK: #1 main {{.*}}mutexset3.cc:[[@LINE+2]]
pthread_mutex_init(&mtx1, 0);
pthread_mutex_init(&mtx2, 0);
pthread_t t[2];
Modified: compiler-rt/trunk/test/tsan/mutexset4.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/mutexset4.cc?rev=253075&r1=253074&r2=253075&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/mutexset4.cc (original)
+++ compiler-rt/trunk/test/tsan/mutexset4.cc Fri Nov 13 14:36:08 2015
@@ -29,10 +29,10 @@ int main() {
// CHECK: (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]):
// CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init
- // CHECK: #1 main {{.*}}/mutexset4.cc:[[@LINE+4]]
+ // CHECK: #1 main {{.*}}mutexset4.cc:[[@LINE+4]]
// CHECK: Mutex [[M2]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init
- // CHECK: #1 main {{.*}}/mutexset4.cc:[[@LINE+2]]
+ // CHECK: #1 main {{.*}}mutexset4.cc:[[@LINE+2]]
pthread_mutex_init(&mtx1, 0);
pthread_mutex_init(&mtx2, 0);
pthread_t t[2];
Modified: compiler-rt/trunk/test/tsan/mutexset5.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/mutexset5.cc?rev=253075&r1=253074&r2=253075&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/mutexset5.cc (original)
+++ compiler-rt/trunk/test/tsan/mutexset5.cc Fri Nov 13 14:36:08 2015
@@ -30,10 +30,10 @@ int main() {
// CHECK: (mutexes: write [[M2:M[0-9]+]]):
// CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init
- // CHECK: #1 main {{.*}}/mutexset5.cc:[[@LINE+4]]
+ // CHECK: #1 main {{.*}}mutexset5.cc:[[@LINE+4]]
// CHECK: Mutex [[M2]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init
- // CHECK: #1 main {{.*}}/mutexset5.cc:[[@LINE+5]]
+ // CHECK: #1 main {{.*}}mutexset5.cc:[[@LINE+5]]
pthread_mutex_init(&mtx1, 0);
pthread_mutex_init(&mtx2, 0);
pthread_t t[2];
Modified: compiler-rt/trunk/test/tsan/mutexset6.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/mutexset6.cc?rev=253075&r1=253074&r2=253075&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/mutexset6.cc (original)
+++ compiler-rt/trunk/test/tsan/mutexset6.cc Fri Nov 13 14:36:08 2015
@@ -34,11 +34,11 @@ int main() {
// CHECK: Previous write of size 4 at {{.*}} by thread T2
// CHECK: (mutexes: write [[M2:M[0-9]+]], read [[M3:M[0-9]+]]):
// CHECK: Mutex [[M1]] (0x{{.*}}) created at:
- // CHECK: #1 main {{.*}}/mutexset6.cc:[[@LINE+5]]
+ // CHECK: #1 main {{.*}}mutexset6.cc:[[@LINE+5]]
// CHECK: Mutex [[M2]] (0x{{.*}}) created at:
- // CHECK: #1 main {{.*}}/mutexset6.cc:[[@LINE+4]]
+ // CHECK: #1 main {{.*}}mutexset6.cc:[[@LINE+4]]
// CHECK: Mutex [[M3]] (0x{{.*}}) created at:
- // CHECK: #1 main {{.*}}/mutexset6.cc:[[@LINE+3]]
+ // CHECK: #1 main {{.*}}mutexset6.cc:[[@LINE+3]]
pthread_mutex_init(&mtx1, 0);
pthread_spin_init(&mtx2, 0);
pthread_rwlock_init(&mtx3, 0);
Modified: compiler-rt/trunk/test/tsan/mutexset8.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/mutexset8.cc?rev=253075&r1=253074&r2=253075&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/mutexset8.cc (original)
+++ compiler-rt/trunk/test/tsan/mutexset8.cc Fri Nov 13 14:36:08 2015
@@ -26,7 +26,7 @@ int main() {
// CHECK: Previous write of size 4 at {{.*}} by thread T2:
// CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init
- // CHECK: #1 main {{.*}}/mutexset8.cc
+ // CHECK: #1 main {{.*}}mutexset8.cc
mtx = new pthread_mutex_t;
pthread_mutex_init(mtx, 0);
pthread_t t[2];
More information about the llvm-commits
mailing list