diff options
Diffstat (limited to 'test/tsan/Linux')
| -rw-r--r-- | test/tsan/Linux/check_memcpy.c (renamed from test/tsan/Linux/check_memcpy.cc) | 6 | ||||
| -rw-r--r-- | test/tsan/Linux/user_malloc.cc | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/test/tsan/Linux/check_memcpy.cc b/test/tsan/Linux/check_memcpy.c index b81efa42a..75dd7da83 100644 --- a/test/tsan/Linux/check_memcpy.cc +++ b/test/tsan/Linux/check_memcpy.c @@ -1,8 +1,8 @@ // Test that verifies TSan runtime doesn't contain compiler-emitted -// memcpy/memmove calls. It builds the binary with TSan and passes it to -// check_memcpy.sh script. +// memcpy/memmove calls. It builds the binary with TSan and check's +// its objdump. -// RUN: %clangxx_tsan -O1 %s -o %t +// RUN: %clang_tsan -O1 %s -o %t // RUN: llvm-objdump -d %t | FileCheck %s // REQUIRES: compiler-rt-optimized diff --git a/test/tsan/Linux/user_malloc.cc b/test/tsan/Linux/user_malloc.cc index b470e6c54..fbe023dda 100644 --- a/test/tsan/Linux/user_malloc.cc +++ b/test/tsan/Linux/user_malloc.cc @@ -1,18 +1,14 @@ -// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s - -// UNSUPPORTED: powerpc64le - -// FIXME: Remove the test or find how to fix this. -// On some distributions, probably with newer glibc, tsan initialization calls -// dlsym which then calls malloc and crashes because of tsan is not initialized. -// UNSUPPORTED: linux +// RUN: %clangxx_tsan -c -O1 -fno-sanitize=thread %s -o %t.o +// RUN: %clangxx_tsan -O1 %s %t.o -o %t && %run %t 2>&1 | FileCheck %s #include <stdio.h> +#include <stdlib.h> + +#if !__has_feature(thread_sanitizer) // Defined by tsan. extern "C" void *__interceptor_malloc(unsigned long size); extern "C" void __interceptor_free(void *p); - extern "C" void *malloc(unsigned long size) { static int first = 0; if (__sync_lock_test_and_set(&first, 1) == 0) @@ -24,12 +20,16 @@ extern "C" void free(void *p) { __interceptor_free(p); } +#else + int main() { volatile char *p = (char*)malloc(10); p[0] = 0; free((void*)p); } +#endif + // CHECK: user malloc // CHECK-NOT: ThreadSanitizer |