summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/lib/tsan/lit_tests/sleep_sync.cc2
-rw-r--r--compiler-rt/lib/tsan/tests/rtl/tsan_test.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc b/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc
index 566d04b1c26..613811b2734 100644
--- a/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc
+++ b/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc
@@ -1,3 +1,5 @@
+// FIXME: Understand why this test fails if TSan is re-execed.
+// RUN: ulimit -s 8192
// RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s
#include <pthread.h>
#include <unistd.h>
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc
index 50fee84ace3..2184284d39c 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc
@@ -34,7 +34,7 @@ int run_tests(int argc, char **argv) {
TestMutexBeforeInit(); // Mutexes must be usable before __tsan_init();
__tsan_init();
__tsan_func_entry(__builtin_return_address(0));
- __tsan_func_entry((void*)((uintptr_t)&run_tests + 1));
+ __tsan_func_entry((void*)((intptr_t)&run_tests + 1));
testing::GTEST_FLAG(death_test_style) = "threadsafe";
testing::InitGoogleTest(&argc, argv);
OpenPOWER on IntegriCloud