Imported Upstream version 1.6.0+dfsg1

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

diff --git a/src/compiler-rt/test/tsan/halt_on_error.cc b/src/compiler-rt/test/tsan/halt_on_error.cc
index 4574801786def08aabf9c6f8781f0646674e9bb0..e55454b57c1d7c9be0df69023f245e920ad0a6b4 100644 (file)
--- a/src/compiler-rt/test/tsan/halt_on_error.cc
+++ b/src/compiler-rt/test/tsan/halt_on_error.cc
@@ -1,21 +1,21 @@
-// RUN: %clang_tsan -O1 %s -o %t && TSAN_OPTIONS="$TSAN_OPTIONS halt_on_error=1" not %run %t 2>&1 | FileCheck %s
-#include <pthread.h>
-#include <stdio.h>
-#include <unistd.h>
+// RUN: %clang_tsan -O1 %s -o %t && TSAN_OPTIONS="$TSAN_OPTIONS halt_on_error=1" %deflake %run %t | FileCheck %s
+#include "test.h"
 
 int X;
 
 void *Thread(void *x) {
-  sleep(1);
+  barrier_wait(&barrier);
   X = 42;
   return 0;
 }
 
 int main() {
+  barrier_init(&barrier, 2);
   fprintf(stderr, "BEFORE\n");
   pthread_t t;
   pthread_create(&t, 0, Thread, 0);
   X = 43;
+  barrier_wait(&barrier);
   pthread_join(t, 0);
   fprintf(stderr, "AFTER\n");
   return 0;