[compiler-rt] r357510 - [NFC][libdispatch] Improve a few tests

[Julian Lettner via llvm-commits]

Author: yln
Date: Tue Apr  2 11:46:59 2019
New Revision: 357510

URL: http://llvm.org/viewvc/llvm-project?rev=357510&view=rev
Log:
[NFC][libdispatch] Improve a few tests

Modified:
    compiler-rt/trunk/test/tsan/libdispatch/apply.c
    compiler-rt/trunk/test/tsan/libdispatch/data.c
    compiler-rt/trunk/test/tsan/libdispatch/source-serial.c

Modified: compiler-rt/trunk/test/tsan/libdispatch/apply.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/libdispatch/apply.c?rev=357510&r1=357509&r2=357510&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/libdispatch/apply.c (original)
+++ compiler-rt/trunk/test/tsan/libdispatch/apply.c Tue Apr  2 11:46:59 2019
@@ -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

Modified: compiler-rt/trunk/test/tsan/libdispatch/data.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/libdispatch/data.c?rev=357510&r1=357509&r2=357510&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/libdispatch/data.c (original)
+++ compiler-rt/trunk/test/tsan/libdispatch/data.c Tue Apr  2 11:46:59 2019
@@ -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.

Modified: compiler-rt/trunk/test/tsan/libdispatch/source-serial.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/libdispatch/source-serial.c?rev=357510&r1=357509&r2=357510&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/libdispatch/source-serial.c (original)
+++ compiler-rt/trunk/test/tsan/libdispatch/source-serial.c Tue Apr  2 11:46:59 2019
@@ -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