diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-09-18 09:09:35 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-09-18 09:09:35 +0000 |
| commit | 848abbd236bc42b48b843b187f46a96244efe3f4 (patch) | |
| tree | 0de73541f84bc8426f25ad689c723cb366218a15 /compiler-rt | |
| parent | 3040830fcd40a0a00f954def1cbc65c66216c1ca (diff) | |
| download | bcm5719-llvm-848abbd236bc42b48b843b187f46a96244efe3f4.tar.gz bcm5719-llvm-848abbd236bc42b48b843b187f46a96244efe3f4.zip | |
[TSan] s/uintptr_t/intptr_t in TSan test and enforce stack size limit in one of TSan output tests that somewhy fails otherwise
llvm-svn: 164116
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/tsan/lit_tests/sleep_sync.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/tests/rtl/tsan_test.cc | 2 |
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); |
