Imported Upstream version 1.6.0+dfsg1

[rustc.git] / src / compiler-rt / test / tsan / vptr_harmful_race2.cc

diff --git a/src/compiler-rt/test/tsan/vptr_harmful_race2.cc b/src/compiler-rt/test/tsan/vptr_harmful_race2.cc
index b018d5cb995028619822d4c4f5c58f6af721fd35..a56b74c09689321afdee2d51d1e3c5941707e70e 100644 (file)
--- a/src/compiler-rt/test/tsan/vptr_harmful_race2.cc
+++ b/src/compiler-rt/test/tsan/vptr_harmful_race2.cc
@@ -1,8 +1,6 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s
-#include <pthread.h>
+// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+#include "test.h"
 #include <semaphore.h>
-#include <stdio.h>
-#include <unistd.h>
 
 struct A {
   A() {
@@ -29,18 +27,20 @@ struct B : A {
 static A *obj = new B;
 
 void *Thread1(void *x) {
-  sleep(1);
   obj->F();
+  barrier_wait(&barrier);
   obj->Done();
   return NULL;
 }
 
 void *Thread2(void *x) {
+  barrier_wait(&barrier);
   delete obj;
   return NULL;
 }
 
 int main() {
+  barrier_init(&barrier, 2);
   pthread_t t[2];
   pthread_create(&t[0], NULL, Thread1, NULL);
   pthread_create(&t[1], NULL, Thread2, NULL);