Imported Upstream version 1.6.0+dfsg1

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

diff --git a/src/compiler-rt/test/tsan/java_alloc.cc b/src/compiler-rt/test/tsan/java_alloc.cc
index 0c9c4eb186f9b6581c7fbc1ababbdeb784e86ec7..4a606f7940d31a796f594d2a50484486706fe22e 100644 (file)
--- a/src/compiler-rt/test/tsan/java_alloc.cc
+++ b/src/compiler-rt/test/tsan/java_alloc.cc
@@ -19,14 +19,20 @@ void *Thread(void *p) {
 }
 
 int main() {
-  jptr jheap = (jptr)malloc(kHeapSize);
+  jptr jheap = (jptr)malloc(kHeapSize + 8) + 8;
   __tsan_java_init(jheap, kHeapSize);
   pthread_t th;
   pthread_create(&th, 0, Thread, (void*)(jheap + kHeapSize / 4));
   stress(jheap);
   pthread_join(th, 0);
-  printf("OK\n");
-  return __tsan_java_fini();
+  if (__tsan_java_fini() != 0) {
+    printf("FAILED\n");
+    return 1;
+  }
+  printf("DONE\n");
+  return 0;
 }
 
 // CHECK-NOT: WARNING: ThreadSanitizer: data race
+// CHECK-NOT: FAILED
+// CHECK: DONE