replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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

llvm-svn: 253075
This commit is contained in:
Kuba Brecka 2015-11-13 20:36:08 +00:00
parent 814aa25a92
commit 770dac4382
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/test/tsan/mutexset1.cc
View File

@ -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);

2
compiler-rt/test/tsan/mutexset2.cc
View File

@ -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);

4
compiler-rt/test/tsan/mutexset3.cc
View File

@ -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];

4
compiler-rt/test/tsan/mutexset4.cc
View File

@ -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];

4
compiler-rt/test/tsan/mutexset5.cc
View File

@ -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];

6
compiler-rt/test/tsan/mutexset6.cc
View File

@ -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);

2
compiler-rt/test/tsan/mutexset8.cc
View File

@ -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];