3 files changed, 7 insertions, 6 deletions
diff --git a/compiler-rt/test/tsan/libdispatch/apply.c b/compiler-rt/test/tsan/libdispatch/apply.c
index d361169eed0..08735b38e0e 100644
--- a/compiler-rt/test/tsan/libdispatch/apply.c
+++ b/compiler-rt/test/tsan/libdispatch/apply.c
@@ -55,4 +55,3 @@ int main(int argc, const char *argv[]) {
 // CHECK: array[0] = 142
 // CHECK: array[1] = 143
 // CHECK: done
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/libdispatch/data.c b/compiler-rt/test/tsan/libdispatch/data.c
index 7a6975bdcbd..dd71b1fb0c8 100644
--- a/compiler-rt/test/tsan/libdispatch/data.c
+++ b/compiler-rt/test/tsan/libdispatch/data.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'
 
 // TODO(yln): fails on one of our bots, need to investigate
 // REQUIRES: disabled
@@ -37,5 +37,4 @@ int main(int argc, const char *argv[]) {
 
 // CHECK: Hello world.
 // CHECK: Data destructor.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/libdispatch/source-serial.c b/compiler-rt/test/tsan/libdispatch/source-serial.c
index 79dc1afea06..70963960c75 100644
--- a/compiler-rt/test/tsan/libdispatch/source-serial.c
+++ b/compiler-rt/test/tsan/libdispatch/source-serial.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'
 
 // TODO(yln): fails on one of our bots, need to investigate
 // REQUIRES: disabled
@@ -14,16 +14,18 @@ int main(int argc, const char *argv[]) {
   fprintf(stderr, "Hello world.\n");
 
   dispatch_queue_t q = dispatch_queue_create("my.queue", DISPATCH_QUEUE_SERIAL);
-  dispatch_semaphore_t sem = dispatch_semaphore_create(0);
   dispatch_source_t timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, q);
   long long interval_ms = 10;
   dispatch_source_set_timer(timer, dispatch_time(DISPATCH_TIME_NOW, 0), interval_ms * NSEC_PER_MSEC, 0);
+
+  dispatch_semaphore_t sem = dispatch_semaphore_create(0);
   dispatch_source_set_event_handler(timer, ^{
     fprintf(stderr, "timer\n");
     global++;
 
     if (global > 50) {
       dispatch_semaphore_signal(sem);
+      dispatch_suspend(timer);
     }
   });
   dispatch_resume(timer);
@@ -34,5 +36,6 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
+// CHECK: timer
 // CHECK: Done.
+// CHECK-NOT: timer