diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-01-30 08:41:57 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-01-30 08:41:57 +0000 |
| commit | a1eb11f9153a081a992637c4fe746f570473448d (patch) | |
| tree | 1950831c1fda8bba4349d2a4bd1119757f99ac29 /compiler-rt | |
| parent | d21b72730fb9fb8d2bfe0c2bda7147a8c2aabba7 (diff) | |
| download | bcm5719-llvm-a1eb11f9153a081a992637c4fe746f570473448d.tar.gz bcm5719-llvm-a1eb11f9153a081a992637c4fe746f570473448d.zip | |
[TSan] relax output tests a bit to make them pass in gcc build
llvm-svn: 173913
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/tsan/lit_tests/free_race.c | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/lit_tests/free_race2.c | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/lit_tests/race_on_heap.cc | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/lit_tests/signal_malloc.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/compiler-rt/lib/tsan/lit_tests/free_race.c b/compiler-rt/lib/tsan/lit_tests/free_race.c index 7a2ec0cdbed..bb70d201966 100644 --- a/compiler-rt/lib/tsan/lit_tests/free_race.c +++ b/compiler-rt/lib/tsan/lit_tests/free_race.c @@ -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 diff --git a/compiler-rt/lib/tsan/lit_tests/free_race2.c b/compiler-rt/lib/tsan/lit_tests/free_race2.c index 095f82ea081..f20774b2d8d 100644 --- a/compiler-rt/lib/tsan/lit_tests/free_race2.c +++ b/compiler-rt/lib/tsan/lit_tests/free_race2.c @@ -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 diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_heap.cc b/compiler-rt/lib/tsan/lit_tests/race_on_heap.cc index dc679e8bf3f..35434eac185 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_on_heap.cc +++ b/compiler-rt/lib/tsan/lit_tests/race_on_heap.cc @@ -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 diff --git a/compiler-rt/lib/tsan/lit_tests/signal_malloc.cc b/compiler-rt/lib/tsan/lit_tests/signal_malloc.cc index d1fc0f476ad..506fb9fd917 100644 --- a/compiler-rt/lib/tsan/lit_tests/signal_malloc.cc +++ b/compiler-rt/lib/tsan/lit_tests/signal_malloc.cc @@ -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); |
