diff options
author | Alexey Samsonov <samsonov@google.com> | 2014-02-14 14:35:48 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2014-02-14 14:35:48 +0000 |
commit | e6a6183e9b8ecf7dec8808fa87577d5b574ca22e (patch) | |
tree | a6e5f3181f2e0c4ffc21f9648c5e9c873f34b330 | |
parent | 9f20d6703479a952465f7db0c2fbd70904c030c2 (diff) | |
download | bcm5719-llvm-e6a6183e9b8ecf7dec8808fa87577d5b574ca22e.tar.gz bcm5719-llvm-e6a6183e9b8ecf7dec8808fa87577d5b574ca22e.zip |
Move TSan lit-tests under test/tsan
llvm-svn: 201414
-rw-r--r-- | compiler-rt/CMakeLists.txt | 1 | ||||
-rw-r--r-- | compiler-rt/lib/tsan/CMakeLists.txt | 5 | ||||
-rw-r--r-- | compiler-rt/lib/tsan/Makefile.old | 3 | ||||
-rwxr-xr-x | compiler-rt/lib/tsan/check_memcpy.sh | 3 | ||||
-rw-r--r-- | compiler-rt/lib/tsan/lit_tests/CMakeLists.txt | 35 | ||||
-rw-r--r-- | compiler-rt/lib/tsan/lit_tests/Unit/lit.cfg | 23 | ||||
-rw-r--r-- | compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in | 8 | ||||
-rw-r--r-- | compiler-rt/lib/tsan/tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | compiler-rt/test/CMakeLists.txt | 3 | ||||
-rw-r--r-- | compiler-rt/test/tsan/CMakeLists.txt | 19 | ||||
-rw-r--r-- | compiler-rt/test/tsan/Helpers/blacklist.txt (renamed from compiler-rt/lib/tsan/lit_tests/Helpers/blacklist.txt) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/Helpers/lit.local.cfg (renamed from compiler-rt/lib/tsan/lit_tests/Helpers/lit.local.cfg) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/SharedLibs/lit.local.cfg (renamed from compiler-rt/lib/tsan/lit_tests/SharedLibs/lit.local.cfg) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/SharedLibs/load_shared_lib-so.cc (renamed from compiler-rt/lib/tsan/lit_tests/SharedLibs/load_shared_lib-so.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/Unit/lit.site.cfg.in | 14 | ||||
-rw-r--r-- | compiler-rt/test/tsan/aligned_vs_unaligned_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/aligned_vs_unaligned_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/allocator_returns_null.cc (renamed from compiler-rt/lib/tsan/lit_tests/allocator_returns_null.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/atomic_free.cc (renamed from compiler-rt/lib/tsan/lit_tests/atomic_free.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/atomic_free2.cc (renamed from compiler-rt/lib/tsan/lit_tests/atomic_free2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/atomic_norace.cc (renamed from compiler-rt/lib/tsan/lit_tests/atomic_norace.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/atomic_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/atomic_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/atomic_stack.cc (renamed from compiler-rt/lib/tsan/lit_tests/atomic_stack.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/benign_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/benign_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/blacklist.cc (renamed from compiler-rt/lib/tsan/lit_tests/blacklist.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/cond.c (renamed from compiler-rt/lib/tsan/lit_tests/cond.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/cond_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/cond_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/cond_version.c (renamed from compiler-rt/lib/tsan/lit_tests/cond_version.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/deep_stack1.cc (renamed from compiler-rt/lib/tsan/lit_tests/deep_stack1.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/default_options.cc (renamed from compiler-rt/lib/tsan/lit_tests/default_options.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_close_norace.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_close_norace.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_close_norace2.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_close_norace2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_dup_norace.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_dup_norace.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_location.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_location.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_pipe_norace.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_pipe_norace.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_pipe_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_pipe_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_socket_connect_norace.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_socket_connect_norace.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_socket_norace.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_socket_norace.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_socketpair_norace.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_socketpair_norace.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fd_stdout_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/fd_stdout_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fork_deadlock.cc (renamed from compiler-rt/lib/tsan/lit_tests/fork_deadlock.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fork_multithreaded.cc (renamed from compiler-rt/lib/tsan/lit_tests/fork_multithreaded.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/fork_multithreaded3.cc (renamed from compiler-rt/lib/tsan/lit_tests/fork_multithreaded3.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/free_race.c (renamed from compiler-rt/lib/tsan/lit_tests/free_race.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/free_race.c.supp (renamed from compiler-rt/lib/tsan/lit_tests/free_race.c.supp) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/free_race2.c (renamed from compiler-rt/lib/tsan/lit_tests/free_race2.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/getline_nohang.cc (renamed from compiler-rt/lib/tsan/lit_tests/getline_nohang.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/global_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/global_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/halt_on_error.cc (renamed from compiler-rt/lib/tsan/lit_tests/halt_on_error.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/heap_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/heap_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_free.cc (renamed from compiler-rt/lib/tsan/lit_tests/ignore_free.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_lib0.cc (renamed from compiler-rt/lib/tsan/lit_tests/ignore_lib0.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_lib0.cc.supp (renamed from compiler-rt/lib/tsan/lit_tests/ignore_lib0.cc.supp) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_lib1.cc (renamed from compiler-rt/lib/tsan/lit_tests/ignore_lib1.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_lib1.cc.supp (renamed from compiler-rt/lib/tsan/lit_tests/ignore_lib1.cc.supp) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_lib2.cc (renamed from compiler-rt/lib/tsan/lit_tests/ignore_lib2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_lib2.cc.supp (renamed from compiler-rt/lib/tsan/lit_tests/ignore_lib2.cc.supp) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_lib3.cc (renamed from compiler-rt/lib/tsan/lit_tests/ignore_lib3.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_lib3.cc.supp (renamed from compiler-rt/lib/tsan/lit_tests/ignore_lib3.cc.supp) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_lib_lib.h (renamed from compiler-rt/lib/tsan/lit_tests/ignore_lib_lib.h) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_malloc.cc (renamed from compiler-rt/lib/tsan/lit_tests/ignore_malloc.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/ignore_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/ignore_sync.cc (renamed from compiler-rt/lib/tsan/lit_tests/ignore_sync.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/inlined_memcpy_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/inlined_memcpy_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/interface_atomic_test.c (renamed from compiler-rt/lib/tsan/lit_tests/interface_atomic_test.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/java.h (renamed from compiler-rt/lib/tsan/lit_tests/java.h) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/java_alloc.cc (renamed from compiler-rt/lib/tsan/lit_tests/java_alloc.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/java_lock.cc (renamed from compiler-rt/lib/tsan/lit_tests/java_lock.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/java_lock_move.cc (renamed from compiler-rt/lib/tsan/lit_tests/java_lock_move.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/java_lock_rec.cc (renamed from compiler-rt/lib/tsan/lit_tests/java_lock_rec.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/java_lock_rec_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/java_lock_rec_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/java_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/java_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/java_race_move.cc (renamed from compiler-rt/lib/tsan/lit_tests/java_race_move.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/java_rwlock.cc (renamed from compiler-rt/lib/tsan/lit_tests/java_rwlock.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/lit.cfg (renamed from compiler-rt/lib/tsan/lit_tests/lit.cfg) | 34 | ||||
-rw-r--r-- | compiler-rt/test/tsan/lit.site.cfg.in (renamed from compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/load_shared_lib.cc (renamed from compiler-rt/lib/tsan/lit_tests/load_shared_lib.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/longjmp.cc (renamed from compiler-rt/lib/tsan/lit_tests/longjmp.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/longjmp2.cc (renamed from compiler-rt/lib/tsan/lit_tests/longjmp2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/longjmp3.cc (renamed from compiler-rt/lib/tsan/lit_tests/longjmp3.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/longjmp4.cc (renamed from compiler-rt/lib/tsan/lit_tests/longjmp4.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/malloc_hook.cc (renamed from compiler-rt/lib/tsan/lit_tests/malloc_hook.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/malloc_overflow.cc (renamed from compiler-rt/lib/tsan/lit_tests/malloc_overflow.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/malloc_stack.cc (renamed from compiler-rt/lib/tsan/lit_tests/malloc_stack.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/memcpy_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/memcpy_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mop_with_offset.cc (renamed from compiler-rt/lib/tsan/lit_tests/mop_with_offset.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mop_with_offset2.cc (renamed from compiler-rt/lib/tsan/lit_tests/mop_with_offset2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutex_cycle2.c (renamed from compiler-rt/lib/tsan/lit_tests/mutex_cycle2.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutex_destroy_locked.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutex_destroy_locked.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutex_robust.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutex_robust.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutex_robust2.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutex_robust2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutexset1.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutexset1.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutexset2.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutexset2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutexset3.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutexset3.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutexset4.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutexset4.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutexset5.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutexset5.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutexset6.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutexset6.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutexset7.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutexset7.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/mutexset8.cc (renamed from compiler-rt/lib/tsan/lit_tests/mutexset8.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/oob_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/oob_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/printf-1.c (renamed from compiler-rt/lib/tsan/lit_tests/printf-1.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/race_on_barrier.c (renamed from compiler-rt/lib/tsan/lit_tests/race_on_barrier.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/race_on_barrier2.c (renamed from compiler-rt/lib/tsan/lit_tests/race_on_barrier2.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/race_on_heap.cc (renamed from compiler-rt/lib/tsan/lit_tests/race_on_heap.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/race_on_mutex.c (renamed from compiler-rt/lib/tsan/lit_tests/race_on_mutex.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/race_on_mutex2.c (renamed from compiler-rt/lib/tsan/lit_tests/race_on_mutex2.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/race_on_read.cc (renamed from compiler-rt/lib/tsan/lit_tests/race_on_read.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/race_on_speculative_load.cc (renamed from compiler-rt/lib/tsan/lit_tests/race_on_speculative_load.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/race_on_write.cc (renamed from compiler-rt/lib/tsan/lit_tests/race_on_write.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/race_with_finished_thread.cc (renamed from compiler-rt/lib/tsan/lit_tests/race_with_finished_thread.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/signal_errno.cc (renamed from compiler-rt/lib/tsan/lit_tests/signal_errno.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/signal_malloc.cc (renamed from compiler-rt/lib/tsan/lit_tests/signal_malloc.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/sigsuspend.cc (renamed from compiler-rt/lib/tsan/lit_tests/sigsuspend.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/simple_race.c (renamed from compiler-rt/lib/tsan/lit_tests/simple_race.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/simple_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/simple_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/simple_stack.c (renamed from compiler-rt/lib/tsan/lit_tests/simple_stack.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/simple_stack2.cc (renamed from compiler-rt/lib/tsan/lit_tests/simple_stack2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/sleep_sync.cc (renamed from compiler-rt/lib/tsan/lit_tests/sleep_sync.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/sleep_sync2.cc (renamed from compiler-rt/lib/tsan/lit_tests/sleep_sync2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/stack_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/stack_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/stack_race2.cc (renamed from compiler-rt/lib/tsan/lit_tests/stack_race2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/static_init1.cc (renamed from compiler-rt/lib/tsan/lit_tests/static_init1.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/static_init2.cc (renamed from compiler-rt/lib/tsan/lit_tests/static_init2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/static_init3.cc (renamed from compiler-rt/lib/tsan/lit_tests/static_init3.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/static_init4.cc (renamed from compiler-rt/lib/tsan/lit_tests/static_init4.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/static_init5.cc (renamed from compiler-rt/lib/tsan/lit_tests/static_init5.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/static_init6.cc (renamed from compiler-rt/lib/tsan/lit_tests/static_init6.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/suppress_same_address.cc (renamed from compiler-rt/lib/tsan/lit_tests/suppress_same_address.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/suppress_same_stacks.cc (renamed from compiler-rt/lib/tsan/lit_tests/suppress_same_stacks.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/suppressions_global.cc (renamed from compiler-rt/lib/tsan/lit_tests/suppressions_global.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/suppressions_global.cc.supp (renamed from compiler-rt/lib/tsan/lit_tests/suppressions_global.cc.supp) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/suppressions_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/suppressions_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/suppressions_race.cc.supp (renamed from compiler-rt/lib/tsan/lit_tests/suppressions_race.cc.supp) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/suppressions_race2.cc (renamed from compiler-rt/lib/tsan/lit_tests/suppressions_race2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/suppressions_race2.cc.supp (renamed from compiler-rt/lib/tsan/lit_tests/suppressions_race2.cc.supp) | 0 | ||||
-rwxr-xr-x | compiler-rt/test/tsan/test_output.sh (renamed from compiler-rt/lib/tsan/lit_tests/test_output.sh) | 11 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_end_with_ignore.cc (renamed from compiler-rt/lib/tsan/lit_tests/thread_end_with_ignore.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_end_with_ignore2.cc (renamed from compiler-rt/lib/tsan/lit_tests/thread_end_with_ignore2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_end_with_ignore3.cc (renamed from compiler-rt/lib/tsan/lit_tests/thread_end_with_ignore3.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_leak.c (renamed from compiler-rt/lib/tsan/lit_tests/thread_leak.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_leak2.c (renamed from compiler-rt/lib/tsan/lit_tests/thread_leak2.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_leak3.c (renamed from compiler-rt/lib/tsan/lit_tests/thread_leak3.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_leak4.c (renamed from compiler-rt/lib/tsan/lit_tests/thread_leak4.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_leak5.c (renamed from compiler-rt/lib/tsan/lit_tests/thread_leak5.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_name.cc (renamed from compiler-rt/lib/tsan/lit_tests/thread_name.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/thread_name2.cc (renamed from compiler-rt/lib/tsan/lit_tests/thread_name2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/tiny_race.c (renamed from compiler-rt/lib/tsan/lit_tests/tiny_race.c) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/tls_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/tls_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/tls_race2.cc (renamed from compiler-rt/lib/tsan/lit_tests/tls_race2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/tsan-vs-gvn.cc (renamed from compiler-rt/lib/tsan/lit_tests/tsan-vs-gvn.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/unaligned_norace.cc (renamed from compiler-rt/lib/tsan/lit_tests/unaligned_norace.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/unaligned_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/unaligned_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/user_fopen.cc (renamed from compiler-rt/lib/tsan/lit_tests/user_fopen.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/user_malloc.cc (renamed from compiler-rt/lib/tsan/lit_tests/user_malloc.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/virtual_inheritance_compile_bug.cc (renamed from compiler-rt/lib/tsan/lit_tests/virtual_inheritance_compile_bug.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/vptr_benign_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/vptr_benign_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/vptr_harmful_race.cc (renamed from compiler-rt/lib/tsan/lit_tests/vptr_harmful_race.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/vptr_harmful_race2.cc (renamed from compiler-rt/lib/tsan/lit_tests/vptr_harmful_race2.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/tsan/write_in_reader_lock.cc (renamed from compiler-rt/lib/tsan/lit_tests/write_in_reader_lock.cc) | 0 |
158 files changed, 51 insertions, 112 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index b13c93fbcb0..50d9c307b9a 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -235,6 +235,7 @@ filter_available_targets(ASAN_SUPPORTED_ARCH x86_64 i386 powerpc64) filter_available_targets(DFSAN_SUPPORTED_ARCH x86_64) filter_available_targets(LSAN_SUPPORTED_ARCH x86_64) filter_available_targets(MSAN_SUPPORTED_ARCH x86_64) +filter_available_targets(TSAN_SUPPORTED_ARCH x86_64) filter_available_targets(UBSAN_SUPPORTED_ARCH x86_64 i386) add_subdirectory(include) diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index d962883b90f..bb7d9758100 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -56,7 +56,7 @@ elseif(UNIX) rtl/tsan_platform_linux.cc) endif() -set(TSAN_RUNTIME_LIBRARIES) +add_custom_target(tsan) # TSan is currently supported on 64-bit Linux only. if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE) set(TSAN_ASM_SOURCES rtl/tsan_rtl_amd64.S) @@ -72,11 +72,10 @@ if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE) CFLAGS ${TSAN_RTL_CFLAGS} DEFS ${TSAN_COMMON_DEFINITIONS}) add_sanitizer_rt_symbols(clang_rt.tsan-${arch} rtl/tsan.syms.extra) - list(APPEND TSAN_RUNTIME_LIBRARIES clang_rt.tsan-${arch} + add_dependencies(tsan clang_rt.tsan-${arch} clang_rt.tsan-${arch}-symbols) endif() if(LLVM_INCLUDE_TESTS) add_subdirectory(tests) endif() -add_subdirectory(lit_tests) diff --git a/compiler-rt/lib/tsan/Makefile.old b/compiler-rt/lib/tsan/Makefile.old index de1cfb3a7ba..269ed3faae3 100644 --- a/compiler-rt/lib/tsan/Makefile.old +++ b/compiler-rt/lib/tsan/Makefile.old @@ -31,6 +31,7 @@ RTL_TEST_OBJ=$(patsubst %.cc,%.o,$(RTL_TEST_SRC)) UNIT_TEST_SRC=$(wildcard tests/unit/*_test.cc) UNIT_TEST_OBJ=$(patsubst %.cc,%.o,$(UNIT_TEST_SRC)) UNIT_TEST_HDR=$(wildcard rtl/*.h) $(wildcard ../sanitizer_common/*.h) +LIT_TESTS_PATH=../../test/tsan INCLUDES=-Irtl -I.. -I../../include $(GTEST_INCLUDE) @@ -60,7 +61,7 @@ test: libtsan tsan_test run: all (ulimit -s 8192; ./tsan_test) - CC=$(CLANG) CXX=$(CLANG)++ FILECHECK=$(FILECHECK) ./lit_tests/test_output.sh + CC=$(CLANG) CXX=$(CLANG)++ FILECHECK=$(FILECHECK) $(LIT_TESTS_PATH)/test_output.sh presubmit: ../sanitizer_common/scripts/check_lint.sh diff --git a/compiler-rt/lib/tsan/check_memcpy.sh b/compiler-rt/lib/tsan/check_memcpy.sh index 5d15c638440..fe3e49ee308 100755 --- a/compiler-rt/lib/tsan/check_memcpy.sh +++ b/compiler-rt/lib/tsan/check_memcpy.sh @@ -5,12 +5,13 @@ set -eu ROOTDIR=$(dirname $0) +TEST_DIR=$ROOTDIR/../../test/tsan : ${CXX:=clang++} CFLAGS="-fsanitize=thread -fPIE -O1 -g" LDFLAGS="-pie -lpthread -ldl -lrt -lm -Wl,--whole-archive $ROOTDIR/rtl/libtsan.a -Wl,--no-whole-archive" -SRC=$ROOTDIR/lit_tests/simple_race.cc +SRC=$TEST_DIR/simple_race.cc OBJ=$SRC.o EXE=$SRC.exe $CXX $SRC $CFLAGS -c -o $OBJ diff --git a/compiler-rt/lib/tsan/lit_tests/CMakeLists.txt b/compiler-rt/lib/tsan/lit_tests/CMakeLists.txt deleted file mode 100644 index 1f2fbf98e08..00000000000 --- a/compiler-rt/lib/tsan/lit_tests/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg - ) - -configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg - ) - -if(COMPILER_RT_CAN_EXECUTE_TESTS AND CAN_TARGET_x86_64) - # Run TSan output tests only if we're sure we can produce working binaries. - set(TSAN_TEST_DEPS - ${SANITIZER_COMMON_LIT_TEST_DEPS} - ${TSAN_RUNTIME_LIBRARIES}) - set(TSAN_TEST_PARAMS - tsan_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg - ) - if(LLVM_INCLUDE_TESTS) - list(APPEND TSAN_TEST_DEPS TsanUnitTests) - endif() - add_lit_testsuite(check-tsan "Running ThreadSanitizer tests" - ${CMAKE_CURRENT_BINARY_DIR} - PARAMS ${TSAN_TEST_PARAMS} - DEPENDS ${TSAN_TEST_DEPS} - ) - set_target_properties(check-tsan PROPERTIES FOLDER "TSan unittests") -elseif(LLVM_INCLUDE_TESTS AND CAN_TARGET_x86_64) - # Otherwise run only TSan unit tests (they are linked using the - # host compiler). - add_lit_testsuite(check-tsan "Running ThreadSanitizer tests" - ${CMAKE_CURRENT_BINARY_DIR}/Unit - DEPENDS TsanUnitTests llvm-symbolizer) - set_target_properties(check-tsan PROPERTIES FOLDER "TSan unittests") -endif() diff --git a/compiler-rt/lib/tsan/lit_tests/Unit/lit.cfg b/compiler-rt/lib/tsan/lit_tests/Unit/lit.cfg deleted file mode 100644 index 36585df1c67..00000000000 --- a/compiler-rt/lib/tsan/lit_tests/Unit/lit.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# -*- Python -*- - -import os - -def get_required_attr(config, attr_name): - attr_value = getattr(config, attr_name, None) - if not attr_value: - lit_config.fatal( - "No attribute %r in test configuration! You may need to run " - "tests from your build directory or add this attribute " - "to lit.site.cfg " % attr_name) - return attr_value - -# Setup config name. -config.name = 'ThreadSanitizer-Unit' - -# Setup test source and exec root. For unit tests, we define -# it as build directory with TSan unit tests. -llvm_obj_root = get_required_attr(config, "llvm_obj_root") -config.test_exec_root = os.path.join(llvm_obj_root, "projects", - "compiler-rt", "lib", - "tsan", "tests") -config.test_source_root = config.test_exec_root diff --git a/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in deleted file mode 100644 index 5d7242d1159..00000000000 --- a/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in +++ /dev/null @@ -1,8 +0,0 @@ -## Autogenerated by LLVM/Clang configuration. -# Do not edit! - -# Load common config for all compiler-rt unit tests. -lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured") - -# Load tool-specific config that would do the real work. -lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/Unit/lit.cfg") diff --git a/compiler-rt/lib/tsan/tests/CMakeLists.txt b/compiler-rt/lib/tsan/tests/CMakeLists.txt index f73a8924285..d4218241698 100644 --- a/compiler-rt/lib/tsan/tests/CMakeLists.txt +++ b/compiler-rt/lib/tsan/tests/CMakeLists.txt @@ -18,7 +18,7 @@ macro(tsan_compile obj_list source arch) get_target_flags_for_arch(${arch} TARGET_CFLAGS) clang_compile(${output_obj} ${source} CFLAGS ${TSAN_UNITTEST_CFLAGS} ${TARGET_CFLAGS} - DEPS gtest ${TSAN_RUNTIME_LIBRARIES} ${ARGN}) + DEPS gtest tsan ${ARGN}) list(APPEND ${obj_list} ${output_obj}) endmacro() @@ -33,7 +33,7 @@ macro(add_tsan_unittest testname) get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS) add_compiler_rt_test(TsanUnitTests ${testname} OBJECTS ${TEST_OBJECTS} - DEPS ${TSAN_RUNTIME_LIBRARIES} ${TEST_OBJECTS} + DEPS tsan ${TEST_OBJECTS} LINK_FLAGS ${TARGET_LINK_FLAGS} -fsanitize=thread -lstdc++ -lm) diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt index 590c2d38dbd..72f8aab30b2 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/test/CMakeLists.txt @@ -21,6 +21,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS) if(MSAN_SUPPORTED_ARCH) add_subdirectory(msan) endif() + if(TSAN_SUPPORTED_ARCH) + add_subdirectory(tsan) + endif() if(UBSAN_SUPPORTED_ARCH) add_subdirectory(ubsan) endif() diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt new file mode 100644 index 00000000000..8d79c705ddb --- /dev/null +++ b/compiler-rt/test/tsan/CMakeLists.txt @@ -0,0 +1,19 @@ +configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in + ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg) + +set(TSAN_TEST_DEPS + ${SANITIZER_COMMON_LIT_TEST_DEPS} + tsan) + +if(LLVM_INCLUDE_TESTS) + configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in + ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg) + list(APPEND TSAN_TEST_DEPS TsanUnitTests) +endif() + +add_lit_testsuite(check-tsan "Running ThreadSanitizer tests" + ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${TSAN_TEST_DEPS}) +set_target_properties(check-tsan PROPERTIES FOLDER "TSan tests") diff --git a/compiler-rt/lib/tsan/lit_tests/Helpers/blacklist.txt b/compiler-rt/test/tsan/Helpers/blacklist.txt index 22225e542ff..22225e542ff 100644 --- a/compiler-rt/lib/tsan/lit_tests/Helpers/blacklist.txt +++ b/compiler-rt/test/tsan/Helpers/blacklist.txt diff --git a/compiler-rt/lib/tsan/lit_tests/Helpers/lit.local.cfg b/compiler-rt/test/tsan/Helpers/lit.local.cfg index 9246b10352a..9246b10352a 100644 --- a/compiler-rt/lib/tsan/lit_tests/Helpers/lit.local.cfg +++ b/compiler-rt/test/tsan/Helpers/lit.local.cfg diff --git a/compiler-rt/lib/tsan/lit_tests/SharedLibs/lit.local.cfg b/compiler-rt/test/tsan/SharedLibs/lit.local.cfg index b3677c17a0f..b3677c17a0f 100644 --- a/compiler-rt/lib/tsan/lit_tests/SharedLibs/lit.local.cfg +++ b/compiler-rt/test/tsan/SharedLibs/lit.local.cfg diff --git a/compiler-rt/lib/tsan/lit_tests/SharedLibs/load_shared_lib-so.cc b/compiler-rt/test/tsan/SharedLibs/load_shared_lib-so.cc index d05aa6a40d1..d05aa6a40d1 100644 --- a/compiler-rt/lib/tsan/lit_tests/SharedLibs/load_shared_lib-so.cc +++ b/compiler-rt/test/tsan/SharedLibs/load_shared_lib-so.cc diff --git a/compiler-rt/test/tsan/Unit/lit.site.cfg.in b/compiler-rt/test/tsan/Unit/lit.site.cfg.in new file mode 100644 index 00000000000..9498105653a --- /dev/null +++ b/compiler-rt/test/tsan/Unit/lit.site.cfg.in @@ -0,0 +1,14 @@ +## Autogenerated by LLVM/Clang configuration. +# Do not edit! + +# Load common config for all compiler-rt unit tests. +lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured") + +# Setup config name. +config.name = 'ThreadSanitizer-Unit' + +# Setup test source and exec root. For unit tests, we define +# it as build directory with ASan unit tests. +# FIXME: De-hardcode this path. +config.test_exec_root = "@COMPILER_RT_BINARY_DIR@/lib/tsan/tests" +config.test_source_root = config.test_exec_root diff --git a/compiler-rt/lib/tsan/lit_tests/aligned_vs_unaligned_race.cc b/compiler-rt/test/tsan/aligned_vs_unaligned_race.cc index f4533d08306..f4533d08306 100644 --- a/compiler-rt/lib/tsan/lit_tests/aligned_vs_unaligned_race.cc +++ b/compiler-rt/test/tsan/aligned_vs_unaligned_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/allocator_returns_null.cc b/compiler-rt/test/tsan/allocator_returns_null.cc index 4b5eb5504c2..4b5eb5504c2 100644 --- a/compiler-rt/lib/tsan/lit_tests/allocator_returns_null.cc +++ b/compiler-rt/test/tsan/allocator_returns_null.cc diff --git a/compiler-rt/lib/tsan/lit_tests/atomic_free.cc b/compiler-rt/test/tsan/atomic_free.cc index 87d559362af..87d559362af 100644 --- a/compiler-rt/lib/tsan/lit_tests/atomic_free.cc +++ b/compiler-rt/test/tsan/atomic_free.cc diff --git a/compiler-rt/lib/tsan/lit_tests/atomic_free2.cc b/compiler-rt/test/tsan/atomic_free2.cc index 961ff38c843..961ff38c843 100644 --- a/compiler-rt/lib/tsan/lit_tests/atomic_free2.cc +++ b/compiler-rt/test/tsan/atomic_free2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/atomic_norace.cc b/compiler-rt/test/tsan/atomic_norace.cc index 265459b0758..265459b0758 100644 --- a/compiler-rt/lib/tsan/lit_tests/atomic_norace.cc +++ b/compiler-rt/test/tsan/atomic_norace.cc diff --git a/compiler-rt/lib/tsan/lit_tests/atomic_race.cc b/compiler-rt/test/tsan/atomic_race.cc index 0dfe4d93df6..0dfe4d93df6 100644 --- a/compiler-rt/lib/tsan/lit_tests/atomic_race.cc +++ b/compiler-rt/test/tsan/atomic_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/atomic_stack.cc b/compiler-rt/test/tsan/atomic_stack.cc index 841f74b891a..841f74b891a 100644 --- a/compiler-rt/lib/tsan/lit_tests/atomic_stack.cc +++ b/compiler-rt/test/tsan/atomic_stack.cc diff --git a/compiler-rt/lib/tsan/lit_tests/benign_race.cc b/compiler-rt/test/tsan/benign_race.cc index a4d4d23c362..a4d4d23c362 100644 --- a/compiler-rt/lib/tsan/lit_tests/benign_race.cc +++ b/compiler-rt/test/tsan/benign_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/blacklist.cc b/compiler-rt/test/tsan/blacklist.cc index 5baf926e627..5baf926e627 100644 --- a/compiler-rt/lib/tsan/lit_tests/blacklist.cc +++ b/compiler-rt/test/tsan/blacklist.cc diff --git a/compiler-rt/lib/tsan/lit_tests/cond.c b/compiler-rt/test/tsan/cond.c index 52c87a413eb..52c87a413eb 100644 --- a/compiler-rt/lib/tsan/lit_tests/cond.c +++ b/compiler-rt/test/tsan/cond.c diff --git a/compiler-rt/lib/tsan/lit_tests/cond_race.cc b/compiler-rt/test/tsan/cond_race.cc index 1e2acb24327..1e2acb24327 100644 --- a/compiler-rt/lib/tsan/lit_tests/cond_race.cc +++ b/compiler-rt/test/tsan/cond_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/cond_version.c b/compiler-rt/test/tsan/cond_version.c index 1f966bfacb8..1f966bfacb8 100644 --- a/compiler-rt/lib/tsan/lit_tests/cond_version.c +++ b/compiler-rt/test/tsan/cond_version.c diff --git a/compiler-rt/lib/tsan/lit_tests/deep_stack1.cc b/compiler-rt/test/tsan/deep_stack1.cc index 3048aa8745b..3048aa8745b 100644 --- a/compiler-rt/lib/tsan/lit_tests/deep_stack1.cc +++ b/compiler-rt/test/tsan/deep_stack1.cc diff --git a/compiler-rt/lib/tsan/lit_tests/default_options.cc b/compiler-rt/test/tsan/default_options.cc index 62c6c028f9e..62c6c028f9e 100644 --- a/compiler-rt/lib/tsan/lit_tests/default_options.cc +++ b/compiler-rt/test/tsan/default_options.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_close_norace.cc b/compiler-rt/test/tsan/fd_close_norace.cc index a8b1a6d7b9e..a8b1a6d7b9e 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_close_norace.cc +++ b/compiler-rt/test/tsan/fd_close_norace.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_close_norace2.cc b/compiler-rt/test/tsan/fd_close_norace2.cc index b42b334a27c..b42b334a27c 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_close_norace2.cc +++ b/compiler-rt/test/tsan/fd_close_norace2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_dup_norace.cc b/compiler-rt/test/tsan/fd_dup_norace.cc index 8826f90fc48..8826f90fc48 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_dup_norace.cc +++ b/compiler-rt/test/tsan/fd_dup_norace.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_location.cc b/compiler-rt/test/tsan/fd_location.cc index 2b1e9c56e36..2b1e9c56e36 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_location.cc +++ b/compiler-rt/test/tsan/fd_location.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_pipe_norace.cc b/compiler-rt/test/tsan/fd_pipe_norace.cc index 2da69ea2111..2da69ea2111 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_pipe_norace.cc +++ b/compiler-rt/test/tsan/fd_pipe_norace.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_pipe_race.cc b/compiler-rt/test/tsan/fd_pipe_race.cc index 4dd2b77861a..4dd2b77861a 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_pipe_race.cc +++ b/compiler-rt/test/tsan/fd_pipe_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_socket_connect_norace.cc b/compiler-rt/test/tsan/fd_socket_connect_norace.cc index 065299a9c6b..065299a9c6b 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_socket_connect_norace.cc +++ b/compiler-rt/test/tsan/fd_socket_connect_norace.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_socket_norace.cc b/compiler-rt/test/tsan/fd_socket_norace.cc index 243fc9de223..243fc9de223 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_socket_norace.cc +++ b/compiler-rt/test/tsan/fd_socket_norace.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_socketpair_norace.cc b/compiler-rt/test/tsan/fd_socketpair_norace.cc index f91e4eca0fe..f91e4eca0fe 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_socketpair_norace.cc +++ b/compiler-rt/test/tsan/fd_socketpair_norace.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fd_stdout_race.cc b/compiler-rt/test/tsan/fd_stdout_race.cc index 4b512bb7887..4b512bb7887 100644 --- a/compiler-rt/lib/tsan/lit_tests/fd_stdout_race.cc +++ b/compiler-rt/test/tsan/fd_stdout_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fork_deadlock.cc b/compiler-rt/test/tsan/fork_deadlock.cc index 09500b5be2c..09500b5be2c 100644 --- a/compiler-rt/lib/tsan/lit_tests/fork_deadlock.cc +++ b/compiler-rt/test/tsan/fork_deadlock.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fork_multithreaded.cc b/compiler-rt/test/tsan/fork_multithreaded.cc index 474b53e425a..474b53e425a 100644 --- a/compiler-rt/lib/tsan/lit_tests/fork_multithreaded.cc +++ b/compiler-rt/test/tsan/fork_multithreaded.cc diff --git a/compiler-rt/lib/tsan/lit_tests/fork_multithreaded3.cc b/compiler-rt/test/tsan/fork_multithreaded3.cc index c4ebcce1a39..c4ebcce1a39 100644 --- a/compiler-rt/lib/tsan/lit_tests/fork_multithreaded3.cc +++ b/compiler-rt/test/tsan/fork_multithreaded3.cc diff --git a/compiler-rt/lib/tsan/lit_tests/free_race.c b/compiler-rt/test/tsan/free_race.c index d1db9fece90..d1db9fece90 100644 --- a/compiler-rt/lib/tsan/lit_tests/free_race.c +++ b/compiler-rt/test/tsan/free_race.c diff --git a/compiler-rt/lib/tsan/lit_tests/free_race.c.supp b/compiler-rt/test/tsan/free_race.c.supp index f5d6a4969a4..f5d6a4969a4 100644 --- a/compiler-rt/lib/tsan/lit_tests/free_race.c.supp +++ b/compiler-rt/test/tsan/free_race.c.supp diff --git a/compiler-rt/lib/tsan/lit_tests/free_race2.c b/compiler-rt/test/tsan/free_race2.c index 2b9a41927a4..2b9a41927a4 100644 --- a/compiler-rt/lib/tsan/lit_tests/free_race2.c +++ b/compiler-rt/test/tsan/free_race2.c diff --git a/compiler-rt/lib/tsan/lit_tests/getline_nohang.cc b/compiler-rt/test/tsan/getline_nohang.cc index 1dd17f0646a..1dd17f0646a 100644 --- a/compiler-rt/lib/tsan/lit_tests/getline_nohang.cc +++ b/compiler-rt/test/tsan/getline_nohang.cc diff --git a/compiler-rt/lib/tsan/lit_tests/global_race.cc b/compiler-rt/test/tsan/global_race.cc index 0e3ce2e5033..0e3ce2e5033 100644 --- a/compiler-rt/lib/tsan/lit_tests/global_race.cc +++ b/compiler-rt/test/tsan/global_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/halt_on_error.cc b/compiler-rt/test/tsan/halt_on_error.cc index fddaffff29a..fddaffff29a 100644 --- a/compiler-rt/lib/tsan/lit_tests/halt_on_error.cc +++ b/compiler-rt/test/tsan/halt_on_error.cc diff --git a/compiler-rt/lib/tsan/lit_tests/heap_race.cc b/compiler-rt/test/tsan/heap_race.cc index cc2c1fee532..cc2c1fee532 100644 --- a/compiler-rt/lib/tsan/lit_tests/heap_race.cc +++ b/compiler-rt/test/tsan/heap_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_free.cc b/compiler-rt/test/tsan/ignore_free.cc index 60369cc1baa..60369cc1baa 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_free.cc +++ b/compiler-rt/test/tsan/ignore_free.cc diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_lib0.cc b/compiler-rt/test/tsan/ignore_lib0.cc index ea0f061e609..ea0f061e609 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_lib0.cc +++ b/compiler-rt/test/tsan/ignore_lib0.cc diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_lib0.cc.supp b/compiler-rt/test/tsan/ignore_lib0.cc.supp index 7728c926b7d..7728c926b7d 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_lib0.cc.supp +++ b/compiler-rt/test/tsan/ignore_lib0.cc.supp diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_lib1.cc b/compiler-rt/test/tsan/ignore_lib1.cc index c4f2e734413..c4f2e734413 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_lib1.cc +++ b/compiler-rt/test/tsan/ignore_lib1.cc diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_lib1.cc.supp b/compiler-rt/test/tsan/ignore_lib1.cc.supp index 9f4119ec0bc..9f4119ec0bc 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_lib1.cc.supp +++ b/compiler-rt/test/tsan/ignore_lib1.cc.supp diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_lib2.cc b/compiler-rt/test/tsan/ignore_lib2.cc index 97f9419e4d8..97f9419e4d8 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_lib2.cc +++ b/compiler-rt/test/tsan/ignore_lib2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_lib2.cc.supp b/compiler-rt/test/tsan/ignore_lib2.cc.supp index 1419c71c67e..1419c71c67e 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_lib2.cc.supp +++ b/compiler-rt/test/tsan/ignore_lib2.cc.supp diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_lib3.cc b/compiler-rt/test/tsan/ignore_lib3.cc index 8f237fcc81f..8f237fcc81f 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_lib3.cc +++ b/compiler-rt/test/tsan/ignore_lib3.cc diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_lib3.cc.supp b/compiler-rt/test/tsan/ignore_lib3.cc.supp index 975dbcef99f..975dbcef99f 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_lib3.cc.supp +++ b/compiler-rt/test/tsan/ignore_lib3.cc.supp diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_lib_lib.h b/compiler-rt/test/tsan/ignore_lib_lib.h index 2bfe84dfc0e..2bfe84dfc0e 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_lib_lib.h +++ b/compiler-rt/test/tsan/ignore_lib_lib.h diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_malloc.cc b/compiler-rt/test/tsan/ignore_malloc.cc index 63bd4241b59..63bd4241b59 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_malloc.cc +++ b/compiler-rt/test/tsan/ignore_malloc.cc diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_race.cc b/compiler-rt/test/tsan/ignore_race.cc index 23d74d0ed84..23d74d0ed84 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_race.cc +++ b/compiler-rt/test/tsan/ignore_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_sync.cc b/compiler-rt/test/tsan/ignore_sync.cc index 67f2d906d9c..67f2d906d9c 100644 --- a/compiler-rt/lib/tsan/lit_tests/ignore_sync.cc +++ b/compiler-rt/test/tsan/ignore_sync.cc diff --git a/compiler-rt/lib/tsan/lit_tests/inlined_memcpy_race.cc b/compiler-rt/test/tsan/inlined_memcpy_race.cc index 5dda36e4b9e..5dda36e4b9e 100644 --- a/compiler-rt/lib/tsan/lit_tests/inlined_memcpy_race.cc +++ b/compiler-rt/test/tsan/inlined_memcpy_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/interface_atomic_test.c b/compiler-rt/test/tsan/interface_atomic_test.c index 7f274a0d1d4..7f274a0d1d4 100644 --- a/compiler-rt/lib/tsan/lit_tests/interface_atomic_test.c +++ b/compiler-rt/test/tsan/interface_atomic_test.c diff --git a/compiler-rt/lib/tsan/lit_tests/java.h b/compiler-rt/test/tsan/java.h index 7aa0bca32ce..7aa0bca32ce 100644 --- a/compiler-rt/lib/tsan/lit_tests/java.h +++ b/compiler-rt/test/tsan/java.h diff --git a/compiler-rt/lib/tsan/lit_tests/java_alloc.cc b/compiler-rt/test/tsan/java_alloc.cc index 4dbce70c31e..4dbce70c31e 100644 --- a/compiler-rt/lib/tsan/lit_tests/java_alloc.cc +++ b/compiler-rt/test/tsan/java_alloc.cc diff --git a/compiler-rt/lib/tsan/lit_tests/java_lock.cc b/compiler-rt/test/tsan/java_lock.cc index d9db103504d..d9db103504d 100644 --- a/compiler-rt/lib/tsan/lit_tests/java_lock.cc +++ b/compiler-rt/test/tsan/java_lock.cc diff --git a/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc b/compiler-rt/test/tsan/java_lock_move.cc index 48b5a5a88d3..48b5a5a88d3 100644 --- a/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc +++ b/compiler-rt/test/tsan/java_lock_move.cc diff --git a/compiler-rt/lib/tsan/lit_tests/java_lock_rec.cc b/compiler-rt/test/tsan/java_lock_rec.cc index 5cc80d4a33e..5cc80d4a33e 100644 --- a/compiler-rt/lib/tsan/lit_tests/java_lock_rec.cc +++ b/compiler-rt/test/tsan/java_lock_rec.cc diff --git a/compiler-rt/lib/tsan/lit_tests/java_lock_rec_race.cc b/compiler-rt/test/tsan/java_lock_rec_race.cc index a868e260c86..a868e260c86 100644 --- a/compiler-rt/lib/tsan/lit_tests/java_lock_rec_race.cc +++ b/compiler-rt/test/tsan/java_lock_rec_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/java_race.cc b/compiler-rt/test/tsan/java_race.cc index 4841a7db0a9..4841a7db0a9 100644 --- a/compiler-rt/lib/tsan/lit_tests/java_race.cc +++ b/compiler-rt/test/tsan/java_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/java_race_move.cc b/compiler-rt/test/tsan/java_race_move.cc index 6da8a106483..6da8a106483 100644 --- a/compiler-rt/lib/tsan/lit_tests/java_race_move.cc +++ b/compiler-rt/test/tsan/java_race_move.cc diff --git a/compiler-rt/lib/tsan/lit_tests/java_rwlock.cc b/compiler-rt/test/tsan/java_rwlock.cc index d1f38733ba0..d1f38733ba0 100644 --- a/compiler-rt/lib/tsan/lit_tests/java_rwlock.cc +++ b/compiler-rt/test/tsan/java_rwlock.cc diff --git a/compiler-rt/lib/tsan/lit_tests/lit.cfg b/compiler-rt/test/tsan/lit.cfg index c4193639f49..b437dafa460 100644 --- a/compiler-rt/lib/tsan/lit_tests/lit.cfg +++ b/compiler-rt/test/tsan/lit.cfg @@ -2,8 +2,6 @@ import os -import lit.util - def get_required_attr(config, attr_name): attr_value = getattr(config, attr_name, None) if not attr_value: @@ -19,38 +17,6 @@ config.name = 'ThreadSanitizer' # Setup source root. config.test_source_root = os.path.dirname(__file__) -def DisplayNoConfigMessage(): - lit_config.fatal("No site specific configuration available! " + - "Try running your test from the build tree or running " + - "make check-tsan") - -# Figure out LLVM source root. -llvm_src_root = getattr(config, 'llvm_src_root', None) -if llvm_src_root is None: - # We probably haven't loaded the site-specific configuration: the user - # is likely trying to run a test file directly, and the site configuration - # wasn't created by the build system. - tsan_site_cfg = lit_config.params.get('tsan_site_config', None) - if (tsan_site_cfg) and (os.path.exists(tsan_site_cfg)): - lit_config.load_config(config, tsan_site_cfg) - raise SystemExit - - # Try to guess the location of site-specific configuration using llvm-config - # util that can point where the build tree is. - llvm_config = lit.util.which("llvm-config", config.environment["PATH"]) - if not llvm_config: - DisplayNoConfigMessage() - - # Find out the presumed location of generated site config. - llvm_obj_root = lit.util.capture(["llvm-config", "--obj-root"]).strip() - tsan_site_cfg = os.path.join(llvm_obj_root, "projects", "compiler-rt", - "lib", "tsan", "lit_tests", "lit.site.cfg") - if (not tsan_site_cfg) or (not os.path.exists(tsan_site_cfg)): - DisplayNoConfigMessage() - - lit_config.load_config(config, tsan_site_cfg) - raise SystemExit - # Setup environment variables for running ThreadSanitizer. tsan_options = "atexit_sleep_ms=0" diff --git a/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in b/compiler-rt/test/tsan/lit.site.cfg.in index aebdd5ebc1f..aebdd5ebc1f 100644 --- a/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in +++ b/compiler-rt/test/tsan/lit.site.cfg.in diff --git a/compiler-rt/lib/tsan/lit_tests/load_shared_lib.cc b/compiler-rt/test/tsan/load_shared_lib.cc index d60cd5700a8..d60cd5700a8 100644 --- a/compiler-rt/lib/tsan/lit_tests/load_shared_lib.cc +++ b/compiler-rt/test/tsan/load_shared_lib.cc diff --git a/compiler-rt/lib/tsan/lit_tests/longjmp.cc b/compiler-rt/test/tsan/longjmp.cc index d9ca4ca5e6e..d9ca4ca5e6e 100644 --- a/compiler-rt/lib/tsan/lit_tests/longjmp.cc +++ b/compiler-rt/test/tsan/longjmp.cc diff --git a/compiler-rt/lib/tsan/lit_tests/longjmp2.cc b/compiler-rt/test/tsan/longjmp2.cc index 0d551fa19d9..0d551fa19d9 100644 --- a/compiler-rt/lib/tsan/lit_tests/longjmp2.cc +++ b/compiler-rt/test/tsan/longjmp2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/longjmp3.cc b/compiler-rt/test/tsan/longjmp3.cc index ae2cfd05fe1..ae2cfd05fe1 100644 --- a/compiler-rt/lib/tsan/lit_tests/longjmp3.cc +++ b/compiler-rt/test/tsan/longjmp3.cc diff --git a/compiler-rt/lib/tsan/lit_tests/longjmp4.cc b/compiler-rt/test/tsan/longjmp4.cc index 6b0526ef3a6..6b0526ef3a6 100644 --- a/compiler-rt/lib/tsan/lit_tests/longjmp4.cc +++ b/compiler-rt/test/tsan/longjmp4.cc diff --git a/compiler-rt/lib/tsan/lit_tests/malloc_hook.cc b/compiler-rt/test/tsan/malloc_hook.cc index 82eb6900efd..82eb6900efd 100644 --- a/compiler-rt/lib/tsan/lit_tests/malloc_hook.cc +++ b/compiler-rt/test/tsan/malloc_hook.cc diff --git a/compiler-rt/lib/tsan/lit_tests/malloc_overflow.cc b/compiler-rt/test/tsan/malloc_overflow.cc index afbebc8bec4..afbebc8bec4 100644 --- a/compiler-rt/lib/tsan/lit_tests/malloc_overflow.cc +++ b/compiler-rt/test/tsan/malloc_overflow.cc diff --git a/compiler-rt/lib/tsan/lit_tests/malloc_stack.cc b/compiler-rt/test/tsan/malloc_stack.cc index 3603497ef31..3603497ef31 100644 --- a/compiler-rt/lib/tsan/lit_tests/malloc_stack.cc +++ b/compiler-rt/test/tsan/malloc_stack.cc diff --git a/compiler-rt/lib/tsan/lit_tests/memcpy_race.cc b/compiler-rt/test/tsan/memcpy_race.cc index 8f39113674d..8f39113674d 100644 --- a/compiler-rt/lib/tsan/lit_tests/memcpy_race.cc +++ b/compiler-rt/test/tsan/memcpy_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mop_with_offset.cc b/compiler-rt/test/tsan/mop_with_offset.cc index 2b6a4ff50aa..2b6a4ff50aa 100644 --- a/compiler-rt/lib/tsan/lit_tests/mop_with_offset.cc +++ b/compiler-rt/test/tsan/mop_with_offset.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mop_with_offset2.cc b/compiler-rt/test/tsan/mop_with_offset2.cc index 037c4db5f52..037c4db5f52 100644 --- a/compiler-rt/lib/tsan/lit_tests/mop_with_offset2.cc +++ b/compiler-rt/test/tsan/mop_with_offset2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutex_cycle2.c b/compiler-rt/test/tsan/mutex_cycle2.c index cd1006d4760..cd1006d4760 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutex_cycle2.c +++ b/compiler-rt/test/tsan/mutex_cycle2.c diff --git a/compiler-rt/lib/tsan/lit_tests/mutex_destroy_locked.cc b/compiler-rt/test/tsan/mutex_destroy_locked.cc index 9b020d31b94..9b020d31b94 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutex_destroy_locked.cc +++ b/compiler-rt/test/tsan/mutex_destroy_locked.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutex_robust.cc b/compiler-rt/test/tsan/mutex_robust.cc index b826616076a..b826616076a 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutex_robust.cc +++ b/compiler-rt/test/tsan/mutex_robust.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutex_robust2.cc b/compiler-rt/test/tsan/mutex_robust2.cc index 5bd7ff682d1..5bd7ff682d1 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutex_robust2.cc +++ b/compiler-rt/test/tsan/mutex_robust2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset1.cc b/compiler-rt/test/tsan/mutexset1.cc index ca87a7ba047..ca87a7ba047 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutexset1.cc +++ b/compiler-rt/test/tsan/mutexset1.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset2.cc b/compiler-rt/test/tsan/mutexset2.cc index 9ccf952b005..9ccf952b005 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutexset2.cc +++ b/compiler-rt/test/tsan/mutexset2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset3.cc b/compiler-rt/test/tsan/mutexset3.cc index 272ddafb3c4..272ddafb3c4 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutexset3.cc +++ b/compiler-rt/test/tsan/mutexset3.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset4.cc b/compiler-rt/test/tsan/mutexset4.cc index be751fa92bf..be751fa92bf 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutexset4.cc +++ b/compiler-rt/test/tsan/mutexset4.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset5.cc b/compiler-rt/test/tsan/mutexset5.cc index e013edb4656..e013edb4656 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutexset5.cc +++ b/compiler-rt/test/tsan/mutexset5.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset6.cc b/compiler-rt/test/tsan/mutexset6.cc index f5e6e66becf..f5e6e66becf 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutexset6.cc +++ b/compiler-rt/test/tsan/mutexset6.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset7.cc b/compiler-rt/test/tsan/mutexset7.cc index 51451b21549..51451b21549 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutexset7.cc +++ b/compiler-rt/test/tsan/mutexset7.cc diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset8.cc b/compiler-rt/test/tsan/mutexset8.cc index 8822b050e93..8822b050e93 100644 --- a/compiler-rt/lib/tsan/lit_tests/mutexset8.cc +++ b/compiler-rt/test/tsan/mutexset8.cc diff --git a/compiler-rt/lib/tsan/lit_tests/oob_race.cc b/compiler-rt/test/tsan/oob_race.cc index c84e819cbe7..c84e819cbe7 100644 --- a/compiler-rt/lib/tsan/lit_tests/oob_race.cc +++ b/compiler-rt/test/tsan/oob_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/printf-1.c b/compiler-rt/test/tsan/printf-1.c index a76048e8596..a76048e8596 100644 --- a/compiler-rt/lib/tsan/lit_tests/printf-1.c +++ b/compiler-rt/test/tsan/printf-1.c diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_barrier.c b/compiler-rt/test/tsan/race_on_barrier.c index 3c0199dec22..3c0199dec22 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_on_barrier.c +++ b/compiler-rt/test/tsan/race_on_barrier.c diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_barrier2.c b/compiler-rt/test/tsan/race_on_barrier2.c index 62773d43e66..62773d43e66 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_on_barrier2.c +++ b/compiler-rt/test/tsan/race_on_barrier2.c diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_heap.cc b/compiler-rt/test/tsan/race_on_heap.cc index a84c0de9655..a84c0de9655 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_on_heap.cc +++ b/compiler-rt/test/tsan/race_on_heap.cc diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_mutex.c b/compiler-rt/test/tsan/race_on_mutex.c index e6634141483..e6634141483 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_on_mutex.c +++ b/compiler-rt/test/tsan/race_on_mutex.c diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_mutex2.c b/compiler-rt/test/tsan/race_on_mutex2.c index 80c395e1f9c..80c395e1f9c 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_on_mutex2.c +++ b/compiler-rt/test/tsan/race_on_mutex2.c diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_read.cc b/compiler-rt/test/tsan/race_on_read.cc index e870ff9e83c..e870ff9e83c 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_on_read.cc +++ b/compiler-rt/test/tsan/race_on_read.cc diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_speculative_load.cc b/compiler-rt/test/tsan/race_on_speculative_load.cc index 31f0e4f2a31..31f0e4f2a31 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_on_speculative_load.cc +++ b/compiler-rt/test/tsan/race_on_speculative_load.cc diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_write.cc b/compiler-rt/test/tsan/race_on_write.cc index 8a56c8464b9..8a56c8464b9 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_on_write.cc +++ b/compiler-rt/test/tsan/race_on_write.cc diff --git a/compiler-rt/lib/tsan/lit_tests/race_with_finished_thread.cc b/compiler-rt/test/tsan/race_with_finished_thread.cc index c713c67a398..c713c67a398 100644 --- a/compiler-rt/lib/tsan/lit_tests/race_with_finished_thread.cc +++ b/compiler-rt/test/tsan/race_with_finished_thread.cc diff --git a/compiler-rt/lib/tsan/lit_tests/signal_errno.cc b/compiler-rt/test/tsan/signal_errno.cc index 651f916ac0c..651f916ac0c 100644 --- a/compiler-rt/lib/tsan/lit_tests/signal_errno.cc +++ b/compiler-rt/test/tsan/signal_errno.cc diff --git a/compiler-rt/lib/tsan/lit_tests/signal_malloc.cc b/compiler-rt/test/tsan/signal_malloc.cc index ef180b8a25b..ef180b8a25b 100644 --- a/compiler-rt/lib/tsan/lit_tests/signal_malloc.cc +++ b/compiler-rt/test/tsan/signal_malloc.cc diff --git a/compiler-rt/lib/tsan/lit_tests/sigsuspend.cc b/compiler-rt/test/tsan/sigsuspend.cc index 503bd5629ed..503bd5629ed 100644 --- a/compiler-rt/lib/tsan/lit_tests/sigsuspend.cc +++ b/compiler-rt/test/tsan/sigsuspend.cc diff --git a/compiler-rt/lib/tsan/lit_tests/simple_race.c b/compiler-rt/test/tsan/simple_race.c index 80a83e01a29..80a83e01a29 100644 --- a/compiler-rt/lib/tsan/lit_tests/simple_race.c +++ b/compiler-rt/test/tsan/simple_race.c diff --git a/compiler-rt/lib/tsan/lit_tests/simple_race.cc b/compiler-rt/test/tsan/simple_race.cc index 47854cfd9a3..47854cfd9a3 100644 --- a/compiler-rt/lib/tsan/lit_tests/simple_race.cc +++ b/compiler-rt/test/tsan/simple_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/simple_stack.c b/compiler-rt/test/tsan/simple_stack.c index a447e288044..a447e288044 100644 --- a/compiler-rt/lib/tsan/lit_tests/simple_stack.c +++ b/compiler-rt/test/tsan/simple_stack.c diff --git a/compiler-rt/lib/tsan/lit_tests/simple_stack2.cc b/compiler-rt/test/tsan/simple_stack2.cc index 7a034c4cd6e..7a034c4cd6e 100644 --- a/compiler-rt/lib/tsan/lit_tests/simple_stack2.cc +++ b/compiler-rt/test/tsan/simple_stack2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc b/compiler-rt/test/tsan/sleep_sync.cc index 217a52a097c..217a52a097c 100644 --- a/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc +++ b/compiler-rt/test/tsan/sleep_sync.cc diff --git a/compiler-rt/lib/tsan/lit_tests/sleep_sync2.cc b/compiler-rt/test/tsan/sleep_sync2.cc index e22999279f9..e22999279f9 100644 --- a/compiler-rt/lib/tsan/lit_tests/sleep_sync2.cc +++ b/compiler-rt/test/tsan/sleep_sync2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/stack_race.cc b/compiler-rt/test/tsan/stack_race.cc index 01ff2e83961..01ff2e83961 100644 --- a/compiler-rt/lib/tsan/lit_tests/stack_race.cc +++ b/compiler-rt/test/tsan/stack_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/stack_race2.cc b/compiler-rt/test/tsan/stack_race2.cc index 577f12c95f2..577f12c95f2 100644 --- a/compiler-rt/lib/tsan/lit_tests/stack_race2.cc +++ b/compiler-rt/test/tsan/stack_race2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/static_init1.cc b/compiler-rt/test/tsan/static_init1.cc index 4faf5bc5474..4faf5bc5474 100644 --- a/compiler-rt/lib/tsan/lit_tests/static_init1.cc +++ b/compiler-rt/test/tsan/static_init1.cc diff --git a/compiler-rt/lib/tsan/lit_tests/static_init2.cc b/compiler-rt/test/tsan/static_init2.cc index 96ef821a752..96ef821a752 100644 --- a/compiler-rt/lib/tsan/lit_tests/static_init2.cc +++ b/compiler-rt/test/tsan/static_init2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/static_init3.cc b/compiler-rt/test/tsan/static_init3.cc index 70a3c16878c..70a3c16878c 100644 --- a/compiler-rt/lib/tsan/lit_tests/static_init3.cc +++ b/compiler-rt/test/tsan/static_init3.cc diff --git a/compiler-rt/lib/tsan/lit_tests/static_init4.cc b/compiler-rt/test/tsan/static_init4.cc index 5ecc39926a2..5ecc39926a2 100644 --- a/compiler-rt/lib/tsan/lit_tests/static_init4.cc +++ b/compiler-rt/test/tsan/static_init4.cc diff --git a/compiler-rt/lib/tsan/lit_tests/static_init5.cc b/compiler-rt/test/tsan/static_init5.cc index 1d0ed6d54ca..1d0ed6d54ca 100644 --- a/compiler-rt/lib/tsan/lit_tests/static_init5.cc +++ b/compiler-rt/test/tsan/static_init5.cc diff --git a/compiler-rt/lib/tsan/lit_tests/static_init6.cc b/compiler-rt/test/tsan/static_init6.cc index c9099f9b679..c9099f9b679 100644 --- a/compiler-rt/lib/tsan/lit_tests/static_init6.cc +++ b/compiler-rt/test/tsan/static_init6.cc diff --git a/compiler-rt/lib/tsan/lit_tests/suppress_same_address.cc b/compiler-rt/test/tsan/suppress_same_address.cc index 8fbf7b9ed61..8fbf7b9ed61 100644 --- a/compiler-rt/lib/tsan/lit_tests/suppress_same_address.cc +++ b/compiler-rt/test/tsan/suppress_same_address.cc diff --git a/compiler-rt/lib/tsan/lit_tests/suppress_same_stacks.cc b/compiler-rt/test/tsan/suppress_same_stacks.cc index f0ab8b30435..f0ab8b30435 100644 --- a/compiler-rt/lib/tsan/lit_tests/suppress_same_stacks.cc +++ b/compiler-rt/test/tsan/suppress_same_stacks.cc diff --git a/compiler-rt/lib/tsan/lit_tests/suppressions_global.cc b/compiler-rt/test/tsan/suppressions_global.cc index 181cb56cf2e..181cb56cf2e 100644 --- a/compiler-rt/lib/tsan/lit_tests/suppressions_global.cc +++ b/compiler-rt/test/tsan/suppressions_global.cc diff --git a/compiler-rt/lib/tsan/lit_tests/suppressions_global.cc.supp b/compiler-rt/test/tsan/suppressions_global.cc.supp index 5fa8a2e43a9..5fa8a2e43a9 100644 --- a/compiler-rt/lib/tsan/lit_tests/suppressions_global.cc.supp +++ b/compiler-rt/test/tsan/suppressions_global.cc.supp diff --git a/compiler-rt/lib/tsan/lit_tests/suppressions_race.cc b/compiler-rt/test/tsan/suppressions_race.cc index c88e69bec6a..c88e69bec6a 100644 --- a/compiler-rt/lib/tsan/lit_tests/suppressions_race.cc +++ b/compiler-rt/test/tsan/suppressions_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/suppressions_race.cc.supp b/compiler-rt/test/tsan/suppressions_race.cc.supp index cbdba76ea93..cbdba76ea93 100644 --- a/compiler-rt/lib/tsan/lit_tests/suppressions_race.cc.supp +++ b/compiler-rt/test/tsan/suppressions_race.cc.supp diff --git a/compiler-rt/lib/tsan/lit_tests/suppressions_race2.cc b/compiler-rt/test/tsan/suppressions_race2.cc index 57146f96a42..57146f96a42 100644 --- a/compiler-rt/lib/tsan/lit_tests/suppressions_race2.cc +++ b/compiler-rt/test/tsan/suppressions_race2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/suppressions_race2.cc.supp b/compiler-rt/test/tsan/suppressions_race2.cc.supp index b3c4dbc5936..b3c4dbc5936 100644 --- a/compiler-rt/lib/tsan/lit_tests/suppressions_race2.cc.supp +++ b/compiler-rt/test/tsan/suppressions_race2.cc.supp diff --git a/compiler-rt/lib/tsan/lit_tests/test_output.sh b/compiler-rt/test/tsan/test_output.sh index 347443a7fd3..8a15a673862 100755 --- a/compiler-rt/lib/tsan/lit_tests/test_output.sh +++ b/compiler-rt/test/tsan/test_output.sh @@ -3,8 +3,9 @@ ulimit -s 8192 set -e # fail on any error -ROOTDIR=$(dirname $0)/.. -BLACKLIST=$ROOTDIR/lit_tests/Helpers/blacklist.txt +HERE=$(dirname $0) +TSAN_DIR=$(dirname $0)/../../lib/tsan +BLACKLIST=$HERE/Helpers/blacklist.txt # Assume clang and clang++ are in path. : ${CC:=clang} @@ -13,7 +14,7 @@ BLACKLIST=$ROOTDIR/lit_tests/Helpers/blacklist.txt # TODO: add testing for all of -O0...-O3 CFLAGS="-fsanitize=thread -fsanitize-blacklist=$BLACKLIST -fPIE -O1 -g -Wall" -LDFLAGS="-pie -lpthread -ldl -lrt -lm -Wl,--whole-archive $ROOTDIR/rtl/libtsan.a -Wl,--no-whole-archive" +LDFLAGS="-pie -lpthread -ldl -lrt -lm -Wl,--whole-archive $TSAN_DIR/rtl/libtsan.a -Wl,--no-whole-archive" test_file() { SRC=$1 @@ -31,7 +32,7 @@ test_file() { } if [ "$1" == "" ]; then - for c in $ROOTDIR/lit_tests/*.{c,cc}; do + for c in $HERE/*.{c,cc}; do if [[ $c == */failing_* ]]; then echo SKIPPING FAILING TEST $c continue @@ -54,5 +55,5 @@ if [ "$1" == "" ]; then wait $job || exit 1 done else - test_file $ROOTDIR/lit_tests/$1 $CXX "DUMP" + test_file $HERE/$1 $CXX "DUMP" fi diff --git a/compiler-rt/lib/tsan/lit_tests/thread_end_with_ignore.cc b/compiler-rt/test/tsan/thread_end_with_ignore.cc index 8bb52e3e8c5..8bb52e3e8c5 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_end_with_ignore.cc +++ b/compiler-rt/test/tsan/thread_end_with_ignore.cc diff --git a/compiler-rt/lib/tsan/lit_tests/thread_end_with_ignore2.cc b/compiler-rt/test/tsan/thread_end_with_ignore2.cc index 224599c95d7..224599c95d7 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_end_with_ignore2.cc +++ b/compiler-rt/test/tsan/thread_end_with_ignore2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/thread_end_with_ignore3.cc b/compiler-rt/test/tsan/thread_end_with_ignore3.cc index bf46eb89b5b..bf46eb89b5b 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_end_with_ignore3.cc +++ b/compiler-rt/test/tsan/thread_end_with_ignore3.cc diff --git a/compiler-rt/lib/tsan/lit_tests/thread_leak.c b/compiler-rt/test/tsan/thread_leak.c index c5e669e5d99..c5e669e5d99 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_leak.c +++ b/compiler-rt/test/tsan/thread_leak.c diff --git a/compiler-rt/lib/tsan/lit_tests/thread_leak2.c b/compiler-rt/test/tsan/thread_leak2.c index 39f6b5e02e3..39f6b5e02e3 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_leak2.c +++ b/compiler-rt/test/tsan/thread_leak2.c diff --git a/compiler-rt/lib/tsan/lit_tests/thread_leak3.c b/compiler-rt/test/tsan/thread_leak3.c index 5f447dbdbdf..5f447dbdbdf 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_leak3.c +++ b/compiler-rt/test/tsan/thread_leak3.c diff --git a/compiler-rt/lib/tsan/lit_tests/thread_leak4.c b/compiler-rt/test/tsan/thread_leak4.c index f9fad0360d3..f9fad0360d3 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_leak4.c +++ b/compiler-rt/test/tsan/thread_leak4.c diff --git a/compiler-rt/lib/tsan/lit_tests/thread_leak5.c b/compiler-rt/test/tsan/thread_leak5.c index c19d6177fe1..c19d6177fe1 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_leak5.c +++ b/compiler-rt/test/tsan/thread_leak5.c diff --git a/compiler-rt/lib/tsan/lit_tests/thread_name.cc b/compiler-rt/test/tsan/thread_name.cc index 646ab583624..646ab583624 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_name.cc +++ b/compiler-rt/test/tsan/thread_name.cc diff --git a/compiler-rt/lib/tsan/lit_tests/thread_name2.cc b/compiler-rt/test/tsan/thread_name2.cc index 8c5cb741f61..8c5cb741f61 100644 --- a/compiler-rt/lib/tsan/lit_tests/thread_name2.cc +++ b/compiler-rt/test/tsan/thread_name2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/tiny_race.c b/compiler-rt/test/tsan/tiny_race.c index f77e1606c1d..f77e1606c1d 100644 --- a/compiler-rt/lib/tsan/lit_tests/tiny_race.c +++ b/compiler-rt/test/tsan/tiny_race.c diff --git a/compiler-rt/lib/tsan/lit_tests/tls_race.cc b/compiler-rt/test/tsan/tls_race.cc index 7b1f38d62de..7b1f38d62de 100644 --- a/compiler-rt/lib/tsan/lit_tests/tls_race.cc +++ b/compiler-rt/test/tsan/tls_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/tls_race2.cc b/compiler-rt/test/tsan/tls_race2.cc index 2cf44ae54a8..2cf44ae54a8 100644 --- a/compiler-rt/lib/tsan/lit_tests/tls_race2.cc +++ b/compiler-rt/test/tsan/tls_race2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/tsan-vs-gvn.cc b/compiler-rt/test/tsan/tsan-vs-gvn.cc index 40ae724b78e..40ae724b78e 100644 --- a/compiler-rt/lib/tsan/lit_tests/tsan-vs-gvn.cc +++ b/compiler-rt/test/tsan/tsan-vs-gvn.cc diff --git a/compiler-rt/lib/tsan/lit_tests/unaligned_norace.cc b/compiler-rt/test/tsan/unaligned_norace.cc index 792224b8012..792224b8012 100644 --- a/compiler-rt/lib/tsan/lit_tests/unaligned_norace.cc +++ b/compiler-rt/test/tsan/unaligned_norace.cc diff --git a/compiler-rt/lib/tsan/lit_tests/unaligned_race.cc b/compiler-rt/test/tsan/unaligned_race.cc index 3534ff5d6e0..3534ff5d6e0 100644 --- a/compiler-rt/lib/tsan/lit_tests/unaligned_race.cc +++ b/compiler-rt/test/tsan/unaligned_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/user_fopen.cc b/compiler-rt/test/tsan/user_fopen.cc index 794d598719b..794d598719b 100644 --- a/compiler-rt/lib/tsan/lit_tests/user_fopen.cc +++ b/compiler-rt/test/tsan/user_fopen.cc diff --git a/compiler-rt/lib/tsan/lit_tests/user_malloc.cc b/compiler-rt/test/tsan/user_malloc.cc index 0be6d54fb13..0be6d54fb13 100644 --- a/compiler-rt/lib/tsan/lit_tests/user_malloc.cc +++ b/compiler-rt/test/tsan/user_malloc.cc diff --git a/compiler-rt/lib/tsan/lit_tests/virtual_inheritance_compile_bug.cc b/compiler-rt/test/tsan/virtual_inheritance_compile_bug.cc index 2275b8b8d21..2275b8b8d21 100644 --- a/compiler-rt/lib/tsan/lit_tests/virtual_inheritance_compile_bug.cc +++ b/compiler-rt/test/tsan/virtual_inheritance_compile_bug.cc diff --git a/compiler-rt/lib/tsan/lit_tests/vptr_benign_race.cc b/compiler-rt/test/tsan/vptr_benign_race.cc index 8c9fc596e17..8c9fc596e17 100644 --- a/compiler-rt/lib/tsan/lit_tests/vptr_benign_race.cc +++ b/compiler-rt/test/tsan/vptr_benign_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/vptr_harmful_race.cc b/compiler-rt/test/tsan/vptr_harmful_race.cc index 0105c4cedd9..0105c4cedd9 100644 --- a/compiler-rt/lib/tsan/lit_tests/vptr_harmful_race.cc +++ b/compiler-rt/test/tsan/vptr_harmful_race.cc diff --git a/compiler-rt/lib/tsan/lit_tests/vptr_harmful_race2.cc b/compiler-rt/test/tsan/vptr_harmful_race2.cc index 378790c6234..378790c6234 100644 --- a/compiler-rt/lib/tsan/lit_tests/vptr_harmful_race2.cc +++ b/compiler-rt/test/tsan/vptr_harmful_race2.cc diff --git a/compiler-rt/lib/tsan/lit_tests/write_in_reader_lock.cc b/compiler-rt/test/tsan/write_in_reader_lock.cc index e872fe3ff96..e872fe3ff96 100644 --- a/compiler-rt/lib/tsan/lit_tests/write_in_reader_lock.cc +++ b/compiler-rt/test/tsan/write_in_reader_lock.cc |