[TSan][libdispatch] Use FileCheck's --implicit-check-not=...

Use FileCheck's --implicit-check-not='ThreadSanitizer' which increases
the strictness of our tests a bit. NFC.

```
CHECK: start
CHECK-NOT: ThreadSanitizer
CHECK: done
```

With --implicit-check-not, the above is turned into:

```
CHECK-NOT: ThreadSanitizer
CHECK: start
CHECK-NOT: ThreadSanitizer
CHECK: done
CHECK-NOT: ThreadSanitizer
```

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@360927 91177308-0d34-0410-b5e6-96231b3b80d8

18 files changed, 18 insertions, 37 deletions

diff --git a/test/tsan/libdispatch/after.c b/test/tsan/libdispatch/after.c
index 59281e76d..7ec2e10af 100644
--- a/test/tsan/libdispatch/after.c
+++ b/test/tsan/libdispatch/after.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -39,4 +39,3 @@ int main(int argc, const char *argv[]) {
 
 // CHECK: start
 // CHECK: done
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/async-norace.c b/test/tsan/libdispatch/async-norace.c
index c3b603579..ccda84535 100644
--- a/test/tsan/libdispatch/async-norace.c
+++ b/test/tsan/libdispatch/async-norace.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -24,4 +24,3 @@ int main() {
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/barrier.c b/test/tsan/libdispatch/barrier.c
index 52b115ed3..7702ee63c 100644
--- a/test/tsan/libdispatch/barrier.c
+++ b/test/tsan/libdispatch/barrier.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -44,4 +44,3 @@ int main() {
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/blocks.c b/test/tsan/libdispatch/blocks.c
index 413b22085..e8f1e28ef 100644
--- a/test/tsan/libdispatch/blocks.c
+++ b/test/tsan/libdispatch/blocks.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -33,5 +33,3 @@ int main() {
 // CHECK: start
 // CHECK: block_var = 42
 // CHECK: done
-// CHECK-NOT: WARNING: ThreadSanitizer
-// CHECK-NOT: CHECK failed
diff --git a/test/tsan/libdispatch/fd.c b/test/tsan/libdispatch/fd.c
index 9a77a3f3c..107f6252d 100644
--- a/test/tsan/libdispatch/fd.c
+++ b/test/tsan/libdispatch/fd.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <dispatch/dispatch.h>
 
@@ -58,5 +58,4 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/test/tsan/libdispatch/groups-norace.c b/test/tsan/libdispatch/groups-norace.c
index 0a8447e3a..ed6311deb 100644
--- a/test/tsan/libdispatch/groups-norace.c
+++ b/test/tsan/libdispatch/groups-norace.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -48,4 +48,3 @@ int main() {
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/io-barrier.c b/test/tsan/libdispatch/io-barrier.c
index 849644e44..c0d3fb0cf 100644
--- a/test/tsan/libdispatch/io-barrier.c
+++ b/test/tsan/libdispatch/io-barrier.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <dispatch/dispatch.h>
 
@@ -46,5 +46,4 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/test/tsan/libdispatch/io-cleanup.c b/test/tsan/libdispatch/io-cleanup.c
index 3e1c9d78e..8c0ad8f63 100644
--- a/test/tsan/libdispatch/io-cleanup.c
+++ b/test/tsan/libdispatch/io-cleanup.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <dispatch/dispatch.h>
 
@@ -54,5 +54,4 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/test/tsan/libdispatch/io.c b/test/tsan/libdispatch/io.c
index 6302e743d..eeededdb6 100644
--- a/test/tsan/libdispatch/io.c
+++ b/test/tsan/libdispatch/io.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <dispatch/dispatch.h>
 
@@ -115,5 +115,4 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/test/tsan/libdispatch/serial-queue-norace.c b/test/tsan/libdispatch/serial-queue-norace.c
index 17fb5f1c7..2b8009d38 100644
--- a/test/tsan/libdispatch/serial-queue-norace.c
+++ b/test/tsan/libdispatch/serial-queue-norace.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -35,4 +35,3 @@ int main() {
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/source-cancel.c b/test/tsan/libdispatch/source-cancel.c
index bc7282d31..a85de9511 100644
--- a/test/tsan/libdispatch/source-cancel.c
+++ b/test/tsan/libdispatch/source-cancel.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -35,4 +35,3 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/source-cancel2.c b/test/tsan/libdispatch/source-cancel2.c
index 8ec2732dc..7531512b7 100644
--- a/test/tsan/libdispatch/source-cancel2.c
+++ b/test/tsan/libdispatch/source-cancel2.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -38,4 +38,3 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/source-event.c b/test/tsan/libdispatch/source-event.c
index f07dd1ea7..2a907ae46 100644
--- a/test/tsan/libdispatch/source-event.c
+++ b/test/tsan/libdispatch/source-event.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -34,4 +34,3 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/source-event2.c b/test/tsan/libdispatch/source-event2.c
index 5c2b6b72c..1afad950d 100644
--- a/test/tsan/libdispatch/source-event2.c
+++ b/test/tsan/libdispatch/source-event2.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -37,4 +37,3 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/source-registration.c b/test/tsan/libdispatch/source-registration.c
index 296c0055b..f21103e31 100644
--- a/test/tsan/libdispatch/source-registration.c
+++ b/test/tsan/libdispatch/source-registration.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -32,4 +32,3 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/source-registration2.c b/test/tsan/libdispatch/source-registration2.c
index 1e51f6f36..2bfd0b5dd 100644
--- a/test/tsan/libdispatch/source-registration2.c
+++ b/test/tsan/libdispatch/source-registration2.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -35,4 +35,3 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/sync-norace.c b/test/tsan/libdispatch/sync-norace.c
index 38d9be384..c707dd64b 100644
--- a/test/tsan/libdispatch/sync-norace.c
+++ b/test/tsan/libdispatch/sync-norace.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -34,4 +34,3 @@ int main() {
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/test/tsan/libdispatch/target-queue-norace.c b/test/tsan/libdispatch/target-queue-norace.c
index b5361c81f..893e0c4f4 100644
--- a/test/tsan/libdispatch/target-queue-norace.c
+++ b/test/tsan/libdispatch/target-queue-norace.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -37,5 +37,4 @@ int main(int argc, const char *argv[]) {
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.