summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJulian Lettner <jlettner@apple.com>2019-04-02 18:46:59 +0000
committerJulian Lettner <jlettner@apple.com>2019-04-02 18:46:59 +0000
commit5338ad4f606aeba5ee63f9fe3b1d2f75eb46d5d2 (patch)
treee838ad28e5d6ea1147de494a3a77b80fee407ebf /test
parent8cc8b132347e444af3785431fd8fd54014ea98e0 (diff)
downloadcompiler-rt-5338ad4f606aeba5ee63f9fe3b1d2f75eb46d5d2.tar.gz
[NFC][libdispatch] Improve a few tests
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@357510 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r--test/tsan/libdispatch/apply.c1
-rw-r--r--test/tsan/libdispatch/data.c3
-rw-r--r--test/tsan/libdispatch/source-serial.c9
3 files changed, 7 insertions, 6 deletions
diff --git a/test/tsan/libdispatch/apply.c b/test/tsan/libdispatch/apply.c
index d361169ee..08735b38e 100644
--- a/test/tsan/libdispatch/apply.c
+++ b/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/test/tsan/libdispatch/data.c b/test/tsan/libdispatch/data.c
index 7a6975bdc..dd71b1fb0 100644
--- a/test/tsan/libdispatch/data.c
+++ b/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/test/tsan/libdispatch/source-serial.c b/test/tsan/libdispatch/source-serial.c
index 79dc1afea..70963960c 100644
--- a/test/tsan/libdispatch/source-serial.c
+++ b/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