[compiler-rt] a1526cd - [NFC, tsan] Update tsan tests expectation

[Vitaly Buka via llvm-commits]

Author: Pratyai Mazumder
Date: 2020-04-16T17:19:52-07:00
New Revision: a1526cd62b67c76b284b76d6f26f2bb394fd65ca

URL: https://github.com/llvm/llvm-project/commit/a1526cd62b67c76b284b76d6f26f2bb394fd65ca
DIFF: https://github.com/llvm/llvm-project/commit/a1526cd62b67c76b284b76d6f26f2bb394fd65ca.diff

LOG: [NFC, tsan] Update tsan tests expectation

Summary:
These tests pass with clang, but fail if gcc was used.
gcc build creates similar but not the same stacks.

Reviewers: vitalybuka

Reviewed By: vitalybuka

Subscribers: dvyukov, llvm-commits, #sanitizers

Tags: #sanitizers

Differential Revision: https://reviews.llvm.org/D78114

Added: 
    

Modified: 
    compiler-rt/test/tsan/Linux/double_race.cpp
    compiler-rt/test/tsan/inlined_memcpy_race.cpp
    compiler-rt/test/tsan/inlined_memcpy_race2.cpp
    compiler-rt/test/tsan/memcmp_race.cpp
    compiler-rt/test/tsan/memcpy_race.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/tsan/Linux/double_race.cpp b/compiler-rt/test/tsan/Linux/double_race.cpp
index 963619cf9a8a..b670589f9374 100644
--- a/compiler-rt/test/tsan/Linux/double_race.cpp
+++ b/compiler-rt/test/tsan/Linux/double_race.cpp
@@ -45,7 +45,7 @@ int main() {
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   Write of size 8 at {{.*}} by thread T1:
 // CHECK:     #0 memset
-// CHECK:     #1 Thread
+// CHECK:     #{{[12]}} Thread
 // CHECK-NOT: bad PC passed to __tsan_symbolize_external
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   Write of size 8 at {{.*}} by thread T1:

diff  --git a/compiler-rt/test/tsan/inlined_memcpy_race.cpp b/compiler-rt/test/tsan/inlined_memcpy_race.cpp
index 4d085893aae0..eb252e5c76bd 100644
--- a/compiler-rt/test/tsan/inlined_memcpy_race.cpp
+++ b/compiler-rt/test/tsan/inlined_memcpy_race.cpp
@@ -30,8 +30,7 @@ int main() {
 
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   #0 memset
-// CHECK:   #1 MemSetThread
+// CHECK:   #{{[12]}} MemSetThread
 // CHECK:  Previous write
 // CHECK:   #0 {{(memcpy|memmove)}}
-// CHECK:   #1 MemCpyThread
-
+// CHECK:   #{{[12]}} MemCpyThread

diff  --git a/compiler-rt/test/tsan/inlined_memcpy_race2.cpp b/compiler-rt/test/tsan/inlined_memcpy_race2.cpp
index 906a52bd32e4..75b92efda904 100644
--- a/compiler-rt/test/tsan/inlined_memcpy_race2.cpp
+++ b/compiler-rt/test/tsan/inlined_memcpy_race2.cpp
@@ -31,7 +31,7 @@ int main() {
 
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   #0 memset
-// CHECK:   #1 MemSetThread
+// CHECK:   #{{[12]}} MemSetThread
 // CHECK:  Previous write
 // CHECK:   #0 {{(memcpy|memmove)}}
-// CHECK:   #1 MemMoveThread
+// CHECK:   #{{[12]}} MemMoveThread

diff  --git a/compiler-rt/test/tsan/memcmp_race.cpp b/compiler-rt/test/tsan/memcmp_race.cpp
index b76f427e121c..40b11a77b364 100644
--- a/compiler-rt/test/tsan/memcmp_race.cpp
+++ b/compiler-rt/test/tsan/memcmp_race.cpp
@@ -36,7 +36,7 @@ int main() {
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   Write of size 1 at [[ADDR]] by thread T2:
 // CHECK:     #0 {{(memcpy|memmove)}}
-// CHECK:     #1 Thread2
+// CHECK:     #{{[12]}} Thread2
 // CHECK:   Previous read of size 1 at [[ADDR]] by thread T1:
 // CHECK:     #0 memcmp
-// CHECK:     #1 Thread1
+// CHECK:     #{{[12]}} Thread1

diff  --git a/compiler-rt/test/tsan/memcpy_race.cpp b/compiler-rt/test/tsan/memcpy_race.cpp
index 4a098c0405fc..09b2a319e205 100644
--- a/compiler-rt/test/tsan/memcpy_race.cpp
+++ b/compiler-rt/test/tsan/memcpy_race.cpp
@@ -35,7 +35,7 @@ int main() {
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   Write of size 1 at [[ADDR]] by thread T2:
 // CHECK:     #0 {{(memcpy|memmove)}}
-// CHECK:     #1 Thread2
+// CHECK:     #{{[12]}} Thread2
 // CHECK:   Previous write of size 1 at [[ADDR]] by thread T1:
 // CHECK:     #0 {{(memcpy|memmove)}}
-// CHECK:     #1 Thread1
+// CHECK:     #{{[12]}} Thread1