Imported Upstream version 1.6.0+dfsg1

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

diff --git a/src/compiler-rt/test/tsan/malloc_stack.cc b/src/compiler-rt/test/tsan/malloc_stack.cc
index cea6020181ed1e4c7e87a8a84606e048fc6ca79d..f0c6f9354a5f31de2cea984b0d02aa5481465295 100644 (file)
--- a/src/compiler-rt/test/tsan/malloc_stack.cc
+++ b/src/compiler-rt/test/tsan/malloc_stack.cc
@@ -1,20 +1,21 @@
-// RUN: %clang_tsan -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s
-#include <pthread.h>
-#include <unistd.h>
+// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+#include "test.h"
 
 _Atomic(int*) p;
 
 void *thr(void *a) {
-  sleep(1);
+  barrier_wait(&barrier);
   int *pp = __c11_atomic_load(&p, __ATOMIC_RELAXED);
   *pp = 42;
   return 0;
 }
 
 int main() {
+  barrier_init(&barrier, 2);
   pthread_t th;
   pthread_create(&th, 0, thr, p);
   __c11_atomic_store(&p, new int, __ATOMIC_RELAXED);
+  barrier_wait(&barrier);
   pthread_join(th, 0);
 }