From 9f20d6703479a952465f7db0c2fbd70904c030c2 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Fri, 14 Feb 2014 14:06:10 +0000 Subject: [PATCH] Move ASan lit-tests under test/asan llvm-svn: 201413 --- compiler-rt/CMakeLists.txt | 3 +- compiler-rt/lib/asan/CMakeLists.txt | 6 -- compiler-rt/lib/asan/lit_tests/CMakeLists.txt | 65 ---------------------- compiler-rt/test/CMakeLists.txt | 3 + compiler-rt/test/asan/CMakeLists.txt | 64 +++++++++++++++++++++ .../asan}/GenericConfig/lit.site.cfg.in | 4 +- .../asan}/TestCases/Darwin/asan_gen_prefixes.cc | 0 .../TestCases/Darwin/interface_symbols_darwin.c | 2 +- .../asan}/TestCases/Darwin/lit.local.cfg | 0 .../Darwin/malloc_set_zone_name-mprotect.cc | 0 .../TestCases/Darwin/malloc_zone-protected.cc | 0 .../Darwin/reexec-insert-libraries-env.cc | 0 .../Darwin/unset-insert-libraries-on-exec.cc | 0 .../asan}/TestCases/Helpers/blacklist-extra.cc | 0 .../asan}/TestCases/Helpers/echo-env.cc | 0 .../TestCases/Helpers/init-order-atexit-extra.cc | 0 .../Helpers/init-order-pthread-create-extra.cc | 0 .../Helpers/initialization-blacklist-extra.cc | 0 .../Helpers/initialization-blacklist-extra2.cc | 0 .../TestCases/Helpers/initialization-blacklist.txt | 0 .../TestCases/Helpers/initialization-bug-extra.cc | 0 .../TestCases/Helpers/initialization-bug-extra2.cc | 0 .../Helpers/initialization-constexpr-extra.cc | 0 .../Helpers/initialization-nobug-extra.cc | 0 .../asan}/TestCases/Helpers/lit.local.cfg | 0 .../asan}/TestCases/Linux/asan_prelink_test.cc | 0 .../asan}/TestCases/Linux/clone_test.cc | 0 .../asan}/TestCases/Linux/coverage.cc | 0 .../TestCases/Linux/function-sections-are-bad.cc | 0 .../asan}/TestCases/Linux/glob.cc | 0 .../asan}/TestCases/Linux/glob_test_root/aa | 0 .../asan}/TestCases/Linux/glob_test_root/ab | 0 .../asan}/TestCases/Linux/glob_test_root/ba | 0 .../asan}/TestCases/Linux/globals-gc-sections.cc | 0 .../asan}/TestCases/Linux/heap-overflow-large.cc | 0 .../asan}/TestCases/Linux/heavy_uar_test.cc | 0 .../Linux/initialization-bug-any-order.cc | 0 .../TestCases/Linux/interception_failure_test.cc | 0 .../TestCases/Linux/interception_malloc_test.cc | 0 .../TestCases/Linux/interception_readdir_r_test.cc | 0 .../asan}/TestCases/Linux/interception_test.cc | 0 .../TestCases/Linux/interface_symbols_linux.c | 2 +- .../asan}/TestCases/Linux/lit.local.cfg | 0 .../asan}/TestCases/Linux/malloc-in-qsort.cc | 0 .../TestCases/Linux/malloc_delete_mismatch.cc | 0 .../asan}/TestCases/Linux/overflow-in-qsort.cc | 0 .../asan}/TestCases/Linux/preinit_test.cc | 0 .../asan}/TestCases/Linux/ptrace.cc | 0 .../asan}/TestCases/Linux/rlimit_mmap_test.cc | 0 .../asan}/TestCases/Linux/shmctl.cc | 0 .../asan}/TestCases/Linux/stress_dtls.c | 0 .../asan}/TestCases/Linux/swapcontext_test.cc | 0 .../asan}/TestCases/Linux/syscalls.cc | 0 .../asan}/TestCases/Linux/tsd_dtor_leak.cc | 0 .../asan}/TestCases/Linux/uar_signals.cc | 0 .../asan}/TestCases/Linux/unpoison_tls.cc | 0 .../SharedLibs/darwin-dummy-shared-lib-so.cc | 0 .../asan}/TestCases/SharedLibs/dlclose-test-so.cc | 0 .../TestCases/SharedLibs/init-order-dlopen-so.cc | 0 .../asan}/TestCases/SharedLibs/lit.local.cfg | 0 .../TestCases/SharedLibs/shared-lib-test-so.cc | 0 .../TestCases/SharedLibs/start-deactivated-so.cc | 0 .../asan}/TestCases/allocator_returns_null.cc | 0 .../asan}/TestCases/allow_user_segv.cc | 0 .../asan}/TestCases/asan-symbolize-sanity-test.cc | 0 .../TestCases/assign_large_valloc_to_global.cc | 0 .../asan}/TestCases/atexit_stats.cc | 0 .../lit_tests => test/asan}/TestCases/blacklist.cc | 0 .../asan}/TestCases/contiguous_container.cc | 0 .../asan}/TestCases/contiguous_container_crash.cc | 0 .../asan}/TestCases/current_allocated_bytes.cc | 0 .../asan}/TestCases/deep_call_stack.cc | 0 .../asan}/TestCases/deep_stack_uaf.cc | 0 .../asan}/TestCases/deep_tail_call.cc | 0 .../asan}/TestCases/deep_thread_stack.cc | 0 .../asan}/TestCases/default_blacklist.cc | 0 .../asan}/TestCases/default_options.cc | 0 .../asan}/TestCases/dlclose-test.cc | 0 .../asan}/TestCases/double-free.cc | 0 .../asan}/TestCases/force_inline_opt0.cc | 0 .../asan}/TestCases/free_hook_realloc.cc | 0 .../lit_tests => test/asan}/TestCases/gc-test.cc | 0 .../asan}/TestCases/global-demangle.cc | 0 .../asan}/TestCases/global-overflow.cc | 0 .../asan}/TestCases/heap-overflow.cc | 0 .../asan}/TestCases/huge_negative_hea_oob.cc | 0 .../asan}/TestCases/init-order-atexit.cc | 0 .../asan}/TestCases/init-order-dlopen.cc | 0 .../asan}/TestCases/init-order-pthread-create.cc | 0 .../asan}/TestCases/initialization-blacklist.cc | 0 .../asan}/TestCases/initialization-bug.cc | 0 .../asan}/TestCases/initialization-constexpr.cc | 0 .../asan}/TestCases/initialization-nobug.cc | 0 .../lit_tests => test/asan}/TestCases/inline.cc | 0 .../asan}/TestCases/interface_test.cc | 0 .../asan}/TestCases/invalid-free.cc | 0 .../lit_tests => test/asan}/TestCases/ioctl.cc | 0 .../TestCases/large_allocator_unpoisons_on_free.cc | 0 .../asan}/TestCases/large_func_test.cc | 0 .../asan}/TestCases/log-path_test.cc | 0 .../asan}/TestCases/log_path_fork_test.cc.disabled | 0 .../asan}/TestCases/lsan_annotations.cc | 0 .../asan}/TestCases/malloc_context_size.cc | 0 .../asan}/TestCases/malloc_fill.cc | 0 .../asan}/TestCases/malloc_hook.cc | 0 .../asan}/TestCases/max_redzone.cc | 0 .../asan}/TestCases/memcmp_strict_test.cc | 0 .../asan}/TestCases/memcmp_test.cc | 0 .../asan}/TestCases/no_asan_gen_globals.c | 0 .../asan}/TestCases/null_deref.cc | 0 .../asan}/TestCases/on_error_callback.cc | 0 .../asan}/TestCases/partial_right.cc | 0 .../asan}/TestCases/poison_partial.cc | 0 .../asan}/TestCases/print-stack-trace.cc | 0 .../asan}/TestCases/print_summary.cc | 0 .../lit_tests => test/asan}/TestCases/printf-1.c | 0 .../lit_tests => test/asan}/TestCases/printf-2.c | 0 .../lit_tests => test/asan}/TestCases/printf-3.c | 0 .../lit_tests => test/asan}/TestCases/printf-4.c | 0 .../lit_tests => test/asan}/TestCases/printf-5.c | 0 .../lit_tests => test/asan}/TestCases/readv.cc | 0 .../asan}/TestCases/sanity_check_pure_c.c | 0 .../asan}/TestCases/shared-lib-test.cc | 0 .../asan}/TestCases/sleep_before_dying.c | 0 .../stack-buffer-overflow-with-position.cc | 0 .../asan}/TestCases/stack-frame-demangle.cc | 0 .../asan}/TestCases/stack-oob-frames.cc | 0 .../asan}/TestCases/stack-overflow.cc | 0 .../asan}/TestCases/stack-use-after-return.cc | 0 .../asan}/TestCases/start-deactivated.cc | 0 .../asan}/TestCases/strdup_oob_test.cc | 0 .../asan}/TestCases/strerror_r_test.cc | 0 .../asan}/TestCases/strip_path_prefix.c | 0 .../asan}/TestCases/strncpy-overflow.cc | 0 .../asan}/TestCases/throw_call_test.cc | 0 .../asan}/TestCases/throw_catch.cc | 0 .../asan}/TestCases/throw_invoke_test.cc | 0 .../asan}/TestCases/time_interceptor.cc | 0 .../asan}/TestCases/uar_and_exceptions.cc | 0 .../asan}/TestCases/unaligned_loads_and_stores.cc | 0 .../asan}/TestCases/use-after-free-right.cc | 0 .../asan}/TestCases/use-after-free.cc | 0 .../asan}/TestCases/use-after-poison.cc | 0 .../asan}/TestCases/use-after-scope-dtor-order.cc | 0 .../asan}/TestCases/use-after-scope-inlined.cc | 0 .../asan}/TestCases/use-after-scope-nobug.cc | 0 .../asan}/TestCases/use-after-scope-temp.cc | 0 .../asan}/TestCases/use-after-scope.cc | 0 .../asan/lit_tests => test/asan}/TestCases/wait.cc | 0 .../lit_tests => test/asan}/TestCases/waitid.cc | 0 .../lit_tests => test/asan}/Unit/lit.site.cfg.in | 3 +- .../asan}/android_commands/android_common.py | 0 .../asan}/android_commands/android_compile.py | 0 .../asan}/android_commands/android_run.py | 0 .../{lib/asan/lit_tests => test/asan}/lit.cfg | 41 ++------------ 155 files changed, 80 insertions(+), 113 deletions(-) delete mode 100644 compiler-rt/lib/asan/lit_tests/CMakeLists.txt create mode 100644 compiler-rt/test/asan/CMakeLists.txt rename compiler-rt/{lib/asan/lit_tests => test/asan}/GenericConfig/lit.site.cfg.in (82%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Darwin/asan_gen_prefixes.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Darwin/interface_symbols_darwin.c (96%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Darwin/lit.local.cfg (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Darwin/malloc_set_zone_name-mprotect.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Darwin/malloc_zone-protected.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Darwin/reexec-insert-libraries-env.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Darwin/unset-insert-libraries-on-exec.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/blacklist-extra.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/echo-env.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/init-order-atexit-extra.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/init-order-pthread-create-extra.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/initialization-blacklist-extra.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/initialization-blacklist-extra2.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/initialization-blacklist.txt (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/initialization-bug-extra.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/initialization-bug-extra2.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/initialization-constexpr-extra.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/initialization-nobug-extra.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Helpers/lit.local.cfg (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/asan_prelink_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/clone_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/coverage.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/function-sections-are-bad.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/glob.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/glob_test_root/aa (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/glob_test_root/ab (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/glob_test_root/ba (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/globals-gc-sections.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/heap-overflow-large.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/heavy_uar_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/initialization-bug-any-order.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/interception_failure_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/interception_malloc_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/interception_readdir_r_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/interception_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/interface_symbols_linux.c (96%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/lit.local.cfg (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/malloc-in-qsort.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/malloc_delete_mismatch.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/overflow-in-qsort.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/preinit_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/ptrace.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/rlimit_mmap_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/shmctl.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/stress_dtls.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/swapcontext_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/syscalls.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/tsd_dtor_leak.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/uar_signals.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/Linux/unpoison_tls.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/SharedLibs/darwin-dummy-shared-lib-so.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/SharedLibs/dlclose-test-so.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/SharedLibs/init-order-dlopen-so.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/SharedLibs/lit.local.cfg (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/SharedLibs/shared-lib-test-so.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/SharedLibs/start-deactivated-so.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/allocator_returns_null.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/allow_user_segv.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/asan-symbolize-sanity-test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/assign_large_valloc_to_global.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/atexit_stats.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/blacklist.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/contiguous_container.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/contiguous_container_crash.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/current_allocated_bytes.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/deep_call_stack.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/deep_stack_uaf.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/deep_tail_call.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/deep_thread_stack.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/default_blacklist.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/default_options.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/dlclose-test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/double-free.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/force_inline_opt0.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/free_hook_realloc.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/gc-test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/global-demangle.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/global-overflow.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/heap-overflow.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/huge_negative_hea_oob.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/init-order-atexit.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/init-order-dlopen.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/init-order-pthread-create.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/initialization-blacklist.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/initialization-bug.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/initialization-constexpr.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/initialization-nobug.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/inline.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/interface_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/invalid-free.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/ioctl.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/large_allocator_unpoisons_on_free.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/large_func_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/log-path_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/log_path_fork_test.cc.disabled (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/lsan_annotations.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/malloc_context_size.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/malloc_fill.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/malloc_hook.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/max_redzone.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/memcmp_strict_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/memcmp_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/no_asan_gen_globals.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/null_deref.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/on_error_callback.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/partial_right.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/poison_partial.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/print-stack-trace.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/print_summary.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/printf-1.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/printf-2.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/printf-3.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/printf-4.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/printf-5.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/readv.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/sanity_check_pure_c.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/shared-lib-test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/sleep_before_dying.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/stack-buffer-overflow-with-position.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/stack-frame-demangle.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/stack-oob-frames.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/stack-overflow.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/stack-use-after-return.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/start-deactivated.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/strdup_oob_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/strerror_r_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/strip_path_prefix.c (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/strncpy-overflow.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/throw_call_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/throw_catch.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/throw_invoke_test.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/time_interceptor.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/uar_and_exceptions.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/unaligned_loads_and_stores.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/use-after-free-right.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/use-after-free.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/use-after-poison.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/use-after-scope-dtor-order.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/use-after-scope-inlined.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/use-after-scope-nobug.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/use-after-scope-temp.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/use-after-scope.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/wait.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/TestCases/waitid.cc (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/Unit/lit.site.cfg.in (86%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/android_commands/android_common.py (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/android_commands/android_compile.py (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/android_commands/android_run.py (100%) rename compiler-rt/{lib/asan/lit_tests => test/asan}/lit.cfg (64%) diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 3bbcf0af..b13c93f 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -231,6 +231,7 @@ endif() # support only subset of these (e.g. TSan works on x86_64 only). filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH x86_64 i386 powerpc64 arm) +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) @@ -259,6 +260,6 @@ endif() add_subdirectory(lib) if(LLVM_INCLUDE_TESTS) - add_subdirectory(test) add_subdirectory(unittests) endif() +add_subdirectory(test) diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt index 52eb8ef..6b19407 100644 --- a/compiler-rt/lib/asan/CMakeLists.txt +++ b/compiler-rt/lib/asan/CMakeLists.txt @@ -46,10 +46,6 @@ if(ANDROID) ASAN_LOW_MEMORY=1) endif() -# Architectures supported by ASan. -filter_available_targets(ASAN_SUPPORTED_ARCH - x86_64 i386 powerpc64) - # Compile ASan sources into an object library. if(APPLE) foreach(os ${SANITIZER_COMMON_SUPPORTED_DARWIN_OS}) @@ -145,5 +141,3 @@ add_custom_target(asan_runtime_libraries if(LLVM_INCLUDE_TESTS) add_subdirectory(tests) endif() - -add_subdirectory(lit_tests) diff --git a/compiler-rt/lib/asan/lit_tests/CMakeLists.txt b/compiler-rt/lib/asan/lit_tests/CMakeLists.txt deleted file mode 100644 index 223052a..0000000 --- a/compiler-rt/lib/asan/lit_tests/CMakeLists.txt +++ /dev/null @@ -1,65 +0,0 @@ -set(ASAN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) -set(ASAN_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/..) - -if(COMPILER_RT_CAN_EXECUTE_TESTS) - set(ASAN_TESTSUITES) - - if(CAN_TARGET_arm_android) - # This is only true if we are cross-compiling. - # Build all tests with host compiler and use host tools. - set(ASAN_TEST_TARGET_CC ${CMAKE_C_COMPILER}) - get_filename_component(ASAN_TEST_LLVM_TOOLS_DIR ${CMAKE_C_COMPILER} PATH) - set(ASAN_TEST_CONFIG_SUFFIX "-arm-android") - set(ASAN_TEST_BITS "32") - get_target_flags_for_arch(arm_android ASAN_TEST_TARGET_CFLAGS) - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/GenericConfig/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig/lit.site.cfg - ) - list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig) - endif() - - if(CAN_TARGET_x86_64 OR CAN_TARGET_powerpc64) - set(ASAN_TEST_CONFIG_SUFFIX "64") - set(ASAN_TEST_BITS "64") - set(ASAN_TEST_TARGET_CFLAGS ${TARGET_64_BIT_CFLAGS}) - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/GenericConfig/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/64bitConfig/lit.site.cfg - ) - list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/64bitConfig) - endif() - - if(CAN_TARGET_i386) - set(ASAN_TEST_CONFIG_SUFFIX "32") - set(ASAN_TEST_BITS "32") - set(ASAN_TEST_TARGET_CFLAGS ${TARGET_32_BIT_CFLAGS}) - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/GenericConfig/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/32bitConfig/lit.site.cfg - ) - list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/32bitConfig) - endif() - - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg - ) - - # Run ASan tests only if we're sure we may produce working binaries. - set(ASAN_TEST_DEPS - ${SANITIZER_COMMON_LIT_TEST_DEPS} - asan_runtime_libraries) - set(ASAN_TEST_PARAMS - asan_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg) - # FIXME: support unit test in the android test runner - if(LLVM_INCLUDE_TESTS AND NOT CAN_TARGET_arm_android) - list(APPEND ASAN_TEST_DEPS AsanUnitTests) - list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit) - endif() - add_lit_testsuite(check-asan "Running the AddressSanitizer tests" - ${ASAN_TESTSUITES} - PARAMS ${ASAN_TEST_PARAMS} - DEPENDS ${ASAN_TEST_DEPS}) - set_target_properties(check-asan PROPERTIES FOLDER "ASan tests") -endif() diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt index 4b8401e..590c2d3 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/test/CMakeLists.txt @@ -9,6 +9,9 @@ configure_lit_site_cfg( # Run sanitizer tests only if we're sure that clang would produce # working binaries. if(COMPILER_RT_CAN_EXECUTE_TESTS) + if(ASAN_SUPPORTED_ARCH) + add_subdirectory(asan) + endif() if(DFSAN_SUPPORTED_ARCH) add_subdirectory(dfsan) endif() diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt new file mode 100644 index 0000000..c47d048 --- /dev/null +++ b/compiler-rt/test/asan/CMakeLists.txt @@ -0,0 +1,64 @@ +set(ASAN_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + +set(ASAN_TESTSUITES) + +if(CAN_TARGET_arm_android) + # This is only true if we are cross-compiling. + # Build all tests with host compiler and use host tools. + set(ASAN_TEST_TARGET_CC ${CMAKE_C_COMPILER}) + get_filename_component(ASAN_TEST_LLVM_TOOLS_DIR ${CMAKE_C_COMPILER} PATH) + set(ASAN_TEST_CONFIG_SUFFIX "-arm-android") + set(ASAN_TEST_BITS "32") + get_target_flags_for_arch(arm_android ASAN_TEST_TARGET_CFLAGS) + configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/GenericConfig/lit.site.cfg.in + ${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig/lit.site.cfg + ) + list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig) +endif() + +if(CAN_TARGET_x86_64 OR CAN_TARGET_powerpc64) + set(ASAN_TEST_CONFIG_SUFFIX "64") + set(ASAN_TEST_BITS "64") + set(ASAN_TEST_TARGET_CFLAGS ${TARGET_64_BIT_CFLAGS}) + configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/GenericConfig/lit.site.cfg.in + ${CMAKE_CURRENT_BINARY_DIR}/64bitConfig/lit.site.cfg + ) + list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/64bitConfig) +endif() + +if(CAN_TARGET_i386) + set(ASAN_TEST_CONFIG_SUFFIX "32") + set(ASAN_TEST_BITS "32") + set(ASAN_TEST_TARGET_CFLAGS ${TARGET_32_BIT_CFLAGS}) + configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/GenericConfig/lit.site.cfg.in + ${CMAKE_CURRENT_BINARY_DIR}/32bitConfig/lit.site.cfg + ) + list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/32bitConfig) +endif() + +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 + ) +endif() + +# Run ASan tests only if we're sure we may produce working binaries. +set(ASAN_TEST_DEPS + ${SANITIZER_COMMON_LIT_TEST_DEPS} + asan_runtime_libraries) +set(ASAN_TEST_PARAMS + asan_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg) +# FIXME: support unit test in the android test runner +if(LLVM_INCLUDE_TESTS AND NOT CAN_TARGET_arm_android) + list(APPEND ASAN_TEST_DEPS AsanUnitTests) + list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit) +endif() +add_lit_testsuite(check-asan "Running the AddressSanitizer tests" + ${ASAN_TESTSUITES} + PARAMS ${ASAN_TEST_PARAMS} + DEPENDS ${ASAN_TEST_DEPS}) +set_target_properties(check-asan PROPERTIES FOLDER "ASan tests") diff --git a/compiler-rt/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in b/compiler-rt/test/asan/GenericConfig/lit.site.cfg.in similarity index 82% rename from compiler-rt/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in rename to compiler-rt/test/asan/GenericConfig/lit.site.cfg.in index 7d552f3..48ea812 100644 --- a/compiler-rt/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in +++ b/compiler-rt/test/asan/GenericConfig/lit.site.cfg.in @@ -3,7 +3,7 @@ # Tool-specific config options. config.name_suffix = "@ASAN_TEST_CONFIG_SUFFIX@" -config.asan_source_dir = "@ASAN_SOURCE_DIR@" +config.asan_lit_source_dir = "@ASAN_LIT_SOURCE_DIR@" config.target_cflags = "@ASAN_TEST_TARGET_CFLAGS@" config.clang = "@ASAN_TEST_TARGET_CC@" config.llvm_tools_dir = "@ASAN_TEST_LLVM_TOOLS_DIR@" @@ -14,4 +14,4 @@ config.android = "@CAN_TARGET_arm_android@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@ASAN_SOURCE_DIR@/lit_tests/lit.cfg") +lit_config.load_config(config, "@ASAN_LIT_SOURCE_DIR@/lit.cfg") diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/asan_gen_prefixes.cc b/compiler-rt/test/asan/TestCases/Darwin/asan_gen_prefixes.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Darwin/asan_gen_prefixes.cc rename to compiler-rt/test/asan/TestCases/Darwin/asan_gen_prefixes.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/interface_symbols_darwin.c b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c similarity index 96% rename from compiler-rt/lib/asan/lit_tests/TestCases/Darwin/interface_symbols_darwin.c rename to compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c index 962422a..03042d6 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/interface_symbols_darwin.c +++ b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c @@ -15,7 +15,7 @@ // RUN: | grep -v "__asan_default_options" \ // RUN: | grep -v "__asan_on_error" > %t.symbols -// RUN: cat %p/../../../asan_interface_internal.h \ +// RUN: cat %p/../../../../lib/asan/asan_interface_internal.h \ // RUN: | sed "s/\/\/.*//" | sed "s/typedef.*//" \ // RUN: | grep -v "OPTIONAL" \ // RUN: | grep "__asan_.*(" | sed "s/.* __asan_/__asan_/;s/(.*//" \ diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/lit.local.cfg b/compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Darwin/lit.local.cfg rename to compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/malloc_set_zone_name-mprotect.cc b/compiler-rt/test/asan/TestCases/Darwin/malloc_set_zone_name-mprotect.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Darwin/malloc_set_zone_name-mprotect.cc rename to compiler-rt/test/asan/TestCases/Darwin/malloc_set_zone_name-mprotect.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/malloc_zone-protected.cc b/compiler-rt/test/asan/TestCases/Darwin/malloc_zone-protected.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Darwin/malloc_zone-protected.cc rename to compiler-rt/test/asan/TestCases/Darwin/malloc_zone-protected.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/reexec-insert-libraries-env.cc b/compiler-rt/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Darwin/reexec-insert-libraries-env.cc rename to compiler-rt/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/unset-insert-libraries-on-exec.cc b/compiler-rt/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Darwin/unset-insert-libraries-on-exec.cc rename to compiler-rt/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/blacklist-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/blacklist-extra.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/blacklist-extra.cc rename to compiler-rt/test/asan/TestCases/Helpers/blacklist-extra.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/echo-env.cc b/compiler-rt/test/asan/TestCases/Helpers/echo-env.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/echo-env.cc rename to compiler-rt/test/asan/TestCases/Helpers/echo-env.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/init-order-atexit-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/init-order-atexit-extra.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/init-order-atexit-extra.cc rename to compiler-rt/test/asan/TestCases/Helpers/init-order-atexit-extra.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/init-order-pthread-create-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/init-order-pthread-create-extra.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/init-order-pthread-create-extra.cc rename to compiler-rt/test/asan/TestCases/Helpers/init-order-pthread-create-extra.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist-extra.cc rename to compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist-extra2.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra2.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist-extra2.cc rename to compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra2.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist.txt b/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist.txt similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist.txt rename to compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist.txt diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-bug-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-bug-extra.cc rename to compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-bug-extra2.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra2.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-bug-extra2.cc rename to compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra2.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-constexpr-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-constexpr-extra.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-constexpr-extra.cc rename to compiler-rt/test/asan/TestCases/Helpers/initialization-constexpr-extra.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-nobug-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-nobug-extra.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-nobug-extra.cc rename to compiler-rt/test/asan/TestCases/Helpers/initialization-nobug-extra.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/lit.local.cfg b/compiler-rt/test/asan/TestCases/Helpers/lit.local.cfg similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Helpers/lit.local.cfg rename to compiler-rt/test/asan/TestCases/Helpers/lit.local.cfg diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/asan_prelink_test.cc b/compiler-rt/test/asan/TestCases/Linux/asan_prelink_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/asan_prelink_test.cc rename to compiler-rt/test/asan/TestCases/Linux/asan_prelink_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/clone_test.cc b/compiler-rt/test/asan/TestCases/Linux/clone_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/clone_test.cc rename to compiler-rt/test/asan/TestCases/Linux/clone_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/coverage.cc b/compiler-rt/test/asan/TestCases/Linux/coverage.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/coverage.cc rename to compiler-rt/test/asan/TestCases/Linux/coverage.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/function-sections-are-bad.cc b/compiler-rt/test/asan/TestCases/Linux/function-sections-are-bad.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/function-sections-are-bad.cc rename to compiler-rt/test/asan/TestCases/Linux/function-sections-are-bad.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob.cc b/compiler-rt/test/asan/TestCases/Linux/glob.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob.cc rename to compiler-rt/test/asan/TestCases/Linux/glob.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/aa b/compiler-rt/test/asan/TestCases/Linux/glob_test_root/aa similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/aa rename to compiler-rt/test/asan/TestCases/Linux/glob_test_root/aa diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/ab b/compiler-rt/test/asan/TestCases/Linux/glob_test_root/ab similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/ab rename to compiler-rt/test/asan/TestCases/Linux/glob_test_root/ab diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/ba b/compiler-rt/test/asan/TestCases/Linux/glob_test_root/ba similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/ba rename to compiler-rt/test/asan/TestCases/Linux/glob_test_root/ba diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/globals-gc-sections.cc b/compiler-rt/test/asan/TestCases/Linux/globals-gc-sections.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/globals-gc-sections.cc rename to compiler-rt/test/asan/TestCases/Linux/globals-gc-sections.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/heap-overflow-large.cc b/compiler-rt/test/asan/TestCases/Linux/heap-overflow-large.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/heap-overflow-large.cc rename to compiler-rt/test/asan/TestCases/Linux/heap-overflow-large.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/heavy_uar_test.cc b/compiler-rt/test/asan/TestCases/Linux/heavy_uar_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/heavy_uar_test.cc rename to compiler-rt/test/asan/TestCases/Linux/heavy_uar_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc b/compiler-rt/test/asan/TestCases/Linux/initialization-bug-any-order.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc rename to compiler-rt/test/asan/TestCases/Linux/initialization-bug-any-order.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_failure_test.cc b/compiler-rt/test/asan/TestCases/Linux/interception_failure_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_failure_test.cc rename to compiler-rt/test/asan/TestCases/Linux/interception_failure_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_malloc_test.cc b/compiler-rt/test/asan/TestCases/Linux/interception_malloc_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_malloc_test.cc rename to compiler-rt/test/asan/TestCases/Linux/interception_malloc_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_readdir_r_test.cc b/compiler-rt/test/asan/TestCases/Linux/interception_readdir_r_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_readdir_r_test.cc rename to compiler-rt/test/asan/TestCases/Linux/interception_readdir_r_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_test.cc b/compiler-rt/test/asan/TestCases/Linux/interception_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_test.cc rename to compiler-rt/test/asan/TestCases/Linux/interception_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interface_symbols_linux.c b/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.c similarity index 96% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/interface_symbols_linux.c rename to compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.c index ea33084..f67a124 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interface_symbols_linux.c +++ b/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.c @@ -8,7 +8,7 @@ // RUN: | grep -v "__asan_default_options" \ // RUN: | grep -v "__asan_stack_" \ // RUN: | grep -v "__asan_on_error" > %t.symbols -// RUN: cat %p/../../../asan_interface_internal.h \ +// RUN: cat %p/../../../../lib/asan/asan_interface_internal.h \ // RUN: | sed "s/\/\/.*//" | sed "s/typedef.*//" \ // RUN: | grep -v "OPTIONAL" \ // RUN: | grep "__asan_.*(" | sed "s/.* __asan_/__asan_/;s/(.*//" \ diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/lit.local.cfg b/compiler-rt/test/asan/TestCases/Linux/lit.local.cfg similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/lit.local.cfg rename to compiler-rt/test/asan/TestCases/Linux/lit.local.cfg diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc-in-qsort.cc b/compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc-in-qsort.cc rename to compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc_delete_mismatch.cc b/compiler-rt/test/asan/TestCases/Linux/malloc_delete_mismatch.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc_delete_mismatch.cc rename to compiler-rt/test/asan/TestCases/Linux/malloc_delete_mismatch.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/overflow-in-qsort.cc b/compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/overflow-in-qsort.cc rename to compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/preinit_test.cc b/compiler-rt/test/asan/TestCases/Linux/preinit_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/preinit_test.cc rename to compiler-rt/test/asan/TestCases/Linux/preinit_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/ptrace.cc b/compiler-rt/test/asan/TestCases/Linux/ptrace.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/ptrace.cc rename to compiler-rt/test/asan/TestCases/Linux/ptrace.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/rlimit_mmap_test.cc b/compiler-rt/test/asan/TestCases/Linux/rlimit_mmap_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/rlimit_mmap_test.cc rename to compiler-rt/test/asan/TestCases/Linux/rlimit_mmap_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/shmctl.cc b/compiler-rt/test/asan/TestCases/Linux/shmctl.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/shmctl.cc rename to compiler-rt/test/asan/TestCases/Linux/shmctl.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/stress_dtls.c b/compiler-rt/test/asan/TestCases/Linux/stress_dtls.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/stress_dtls.c rename to compiler-rt/test/asan/TestCases/Linux/stress_dtls.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/swapcontext_test.cc b/compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/swapcontext_test.cc rename to compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/syscalls.cc b/compiler-rt/test/asan/TestCases/Linux/syscalls.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/syscalls.cc rename to compiler-rt/test/asan/TestCases/Linux/syscalls.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/tsd_dtor_leak.cc b/compiler-rt/test/asan/TestCases/Linux/tsd_dtor_leak.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/tsd_dtor_leak.cc rename to compiler-rt/test/asan/TestCases/Linux/tsd_dtor_leak.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/uar_signals.cc b/compiler-rt/test/asan/TestCases/Linux/uar_signals.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/uar_signals.cc rename to compiler-rt/test/asan/TestCases/Linux/uar_signals.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/unpoison_tls.cc b/compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/Linux/unpoison_tls.cc rename to compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/darwin-dummy-shared-lib-so.cc b/compiler-rt/test/asan/TestCases/SharedLibs/darwin-dummy-shared-lib-so.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/darwin-dummy-shared-lib-so.cc rename to compiler-rt/test/asan/TestCases/SharedLibs/darwin-dummy-shared-lib-so.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/dlclose-test-so.cc b/compiler-rt/test/asan/TestCases/SharedLibs/dlclose-test-so.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/dlclose-test-so.cc rename to compiler-rt/test/asan/TestCases/SharedLibs/dlclose-test-so.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/init-order-dlopen-so.cc b/compiler-rt/test/asan/TestCases/SharedLibs/init-order-dlopen-so.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/init-order-dlopen-so.cc rename to compiler-rt/test/asan/TestCases/SharedLibs/init-order-dlopen-so.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/lit.local.cfg b/compiler-rt/test/asan/TestCases/SharedLibs/lit.local.cfg similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/lit.local.cfg rename to compiler-rt/test/asan/TestCases/SharedLibs/lit.local.cfg diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/shared-lib-test-so.cc b/compiler-rt/test/asan/TestCases/SharedLibs/shared-lib-test-so.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/shared-lib-test-so.cc rename to compiler-rt/test/asan/TestCases/SharedLibs/shared-lib-test-so.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/start-deactivated-so.cc b/compiler-rt/test/asan/TestCases/SharedLibs/start-deactivated-so.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/start-deactivated-so.cc rename to compiler-rt/test/asan/TestCases/SharedLibs/start-deactivated-so.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/allocator_returns_null.cc b/compiler-rt/test/asan/TestCases/allocator_returns_null.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/allocator_returns_null.cc rename to compiler-rt/test/asan/TestCases/allocator_returns_null.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/allow_user_segv.cc b/compiler-rt/test/asan/TestCases/allow_user_segv.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/allow_user_segv.cc rename to compiler-rt/test/asan/TestCases/allow_user_segv.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/asan-symbolize-sanity-test.cc b/compiler-rt/test/asan/TestCases/asan-symbolize-sanity-test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/asan-symbolize-sanity-test.cc rename to compiler-rt/test/asan/TestCases/asan-symbolize-sanity-test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/assign_large_valloc_to_global.cc b/compiler-rt/test/asan/TestCases/assign_large_valloc_to_global.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/assign_large_valloc_to_global.cc rename to compiler-rt/test/asan/TestCases/assign_large_valloc_to_global.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/atexit_stats.cc b/compiler-rt/test/asan/TestCases/atexit_stats.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/atexit_stats.cc rename to compiler-rt/test/asan/TestCases/atexit_stats.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/blacklist.cc b/compiler-rt/test/asan/TestCases/blacklist.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/blacklist.cc rename to compiler-rt/test/asan/TestCases/blacklist.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/contiguous_container.cc b/compiler-rt/test/asan/TestCases/contiguous_container.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/contiguous_container.cc rename to compiler-rt/test/asan/TestCases/contiguous_container.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/contiguous_container_crash.cc b/compiler-rt/test/asan/TestCases/contiguous_container_crash.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/contiguous_container_crash.cc rename to compiler-rt/test/asan/TestCases/contiguous_container_crash.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/current_allocated_bytes.cc b/compiler-rt/test/asan/TestCases/current_allocated_bytes.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/current_allocated_bytes.cc rename to compiler-rt/test/asan/TestCases/current_allocated_bytes.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/deep_call_stack.cc b/compiler-rt/test/asan/TestCases/deep_call_stack.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/deep_call_stack.cc rename to compiler-rt/test/asan/TestCases/deep_call_stack.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/deep_stack_uaf.cc b/compiler-rt/test/asan/TestCases/deep_stack_uaf.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/deep_stack_uaf.cc rename to compiler-rt/test/asan/TestCases/deep_stack_uaf.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/deep_tail_call.cc b/compiler-rt/test/asan/TestCases/deep_tail_call.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/deep_tail_call.cc rename to compiler-rt/test/asan/TestCases/deep_tail_call.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/deep_thread_stack.cc b/compiler-rt/test/asan/TestCases/deep_thread_stack.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/deep_thread_stack.cc rename to compiler-rt/test/asan/TestCases/deep_thread_stack.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/default_blacklist.cc b/compiler-rt/test/asan/TestCases/default_blacklist.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/default_blacklist.cc rename to compiler-rt/test/asan/TestCases/default_blacklist.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/default_options.cc b/compiler-rt/test/asan/TestCases/default_options.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/default_options.cc rename to compiler-rt/test/asan/TestCases/default_options.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/dlclose-test.cc b/compiler-rt/test/asan/TestCases/dlclose-test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/dlclose-test.cc rename to compiler-rt/test/asan/TestCases/dlclose-test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/double-free.cc b/compiler-rt/test/asan/TestCases/double-free.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/double-free.cc rename to compiler-rt/test/asan/TestCases/double-free.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/force_inline_opt0.cc b/compiler-rt/test/asan/TestCases/force_inline_opt0.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/force_inline_opt0.cc rename to compiler-rt/test/asan/TestCases/force_inline_opt0.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/free_hook_realloc.cc b/compiler-rt/test/asan/TestCases/free_hook_realloc.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/free_hook_realloc.cc rename to compiler-rt/test/asan/TestCases/free_hook_realloc.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/gc-test.cc b/compiler-rt/test/asan/TestCases/gc-test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/gc-test.cc rename to compiler-rt/test/asan/TestCases/gc-test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/global-demangle.cc b/compiler-rt/test/asan/TestCases/global-demangle.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/global-demangle.cc rename to compiler-rt/test/asan/TestCases/global-demangle.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/global-overflow.cc b/compiler-rt/test/asan/TestCases/global-overflow.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/global-overflow.cc rename to compiler-rt/test/asan/TestCases/global-overflow.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/heap-overflow.cc b/compiler-rt/test/asan/TestCases/heap-overflow.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/heap-overflow.cc rename to compiler-rt/test/asan/TestCases/heap-overflow.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/huge_negative_hea_oob.cc b/compiler-rt/test/asan/TestCases/huge_negative_hea_oob.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/huge_negative_hea_oob.cc rename to compiler-rt/test/asan/TestCases/huge_negative_hea_oob.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/init-order-atexit.cc b/compiler-rt/test/asan/TestCases/init-order-atexit.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/init-order-atexit.cc rename to compiler-rt/test/asan/TestCases/init-order-atexit.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/init-order-dlopen.cc b/compiler-rt/test/asan/TestCases/init-order-dlopen.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/init-order-dlopen.cc rename to compiler-rt/test/asan/TestCases/init-order-dlopen.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/init-order-pthread-create.cc b/compiler-rt/test/asan/TestCases/init-order-pthread-create.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/init-order-pthread-create.cc rename to compiler-rt/test/asan/TestCases/init-order-pthread-create.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/initialization-blacklist.cc b/compiler-rt/test/asan/TestCases/initialization-blacklist.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/initialization-blacklist.cc rename to compiler-rt/test/asan/TestCases/initialization-blacklist.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/initialization-bug.cc b/compiler-rt/test/asan/TestCases/initialization-bug.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/initialization-bug.cc rename to compiler-rt/test/asan/TestCases/initialization-bug.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/initialization-constexpr.cc b/compiler-rt/test/asan/TestCases/initialization-constexpr.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/initialization-constexpr.cc rename to compiler-rt/test/asan/TestCases/initialization-constexpr.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/initialization-nobug.cc b/compiler-rt/test/asan/TestCases/initialization-nobug.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/initialization-nobug.cc rename to compiler-rt/test/asan/TestCases/initialization-nobug.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/inline.cc b/compiler-rt/test/asan/TestCases/inline.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/inline.cc rename to compiler-rt/test/asan/TestCases/inline.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/interface_test.cc b/compiler-rt/test/asan/TestCases/interface_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/interface_test.cc rename to compiler-rt/test/asan/TestCases/interface_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/invalid-free.cc b/compiler-rt/test/asan/TestCases/invalid-free.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/invalid-free.cc rename to compiler-rt/test/asan/TestCases/invalid-free.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/ioctl.cc b/compiler-rt/test/asan/TestCases/ioctl.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/ioctl.cc rename to compiler-rt/test/asan/TestCases/ioctl.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/large_allocator_unpoisons_on_free.cc b/compiler-rt/test/asan/TestCases/large_allocator_unpoisons_on_free.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/large_allocator_unpoisons_on_free.cc rename to compiler-rt/test/asan/TestCases/large_allocator_unpoisons_on_free.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/large_func_test.cc b/compiler-rt/test/asan/TestCases/large_func_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/large_func_test.cc rename to compiler-rt/test/asan/TestCases/large_func_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/log-path_test.cc b/compiler-rt/test/asan/TestCases/log-path_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/log-path_test.cc rename to compiler-rt/test/asan/TestCases/log-path_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/log_path_fork_test.cc.disabled b/compiler-rt/test/asan/TestCases/log_path_fork_test.cc.disabled similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/log_path_fork_test.cc.disabled rename to compiler-rt/test/asan/TestCases/log_path_fork_test.cc.disabled diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/lsan_annotations.cc b/compiler-rt/test/asan/TestCases/lsan_annotations.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/lsan_annotations.cc rename to compiler-rt/test/asan/TestCases/lsan_annotations.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/malloc_context_size.cc b/compiler-rt/test/asan/TestCases/malloc_context_size.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/malloc_context_size.cc rename to compiler-rt/test/asan/TestCases/malloc_context_size.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/malloc_fill.cc b/compiler-rt/test/asan/TestCases/malloc_fill.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/malloc_fill.cc rename to compiler-rt/test/asan/TestCases/malloc_fill.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/malloc_hook.cc b/compiler-rt/test/asan/TestCases/malloc_hook.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/malloc_hook.cc rename to compiler-rt/test/asan/TestCases/malloc_hook.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/max_redzone.cc b/compiler-rt/test/asan/TestCases/max_redzone.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/max_redzone.cc rename to compiler-rt/test/asan/TestCases/max_redzone.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_strict_test.cc b/compiler-rt/test/asan/TestCases/memcmp_strict_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/memcmp_strict_test.cc rename to compiler-rt/test/asan/TestCases/memcmp_strict_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_test.cc b/compiler-rt/test/asan/TestCases/memcmp_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/memcmp_test.cc rename to compiler-rt/test/asan/TestCases/memcmp_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/no_asan_gen_globals.c b/compiler-rt/test/asan/TestCases/no_asan_gen_globals.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/no_asan_gen_globals.c rename to compiler-rt/test/asan/TestCases/no_asan_gen_globals.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/null_deref.cc b/compiler-rt/test/asan/TestCases/null_deref.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/null_deref.cc rename to compiler-rt/test/asan/TestCases/null_deref.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/on_error_callback.cc b/compiler-rt/test/asan/TestCases/on_error_callback.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/on_error_callback.cc rename to compiler-rt/test/asan/TestCases/on_error_callback.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/partial_right.cc b/compiler-rt/test/asan/TestCases/partial_right.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/partial_right.cc rename to compiler-rt/test/asan/TestCases/partial_right.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/poison_partial.cc b/compiler-rt/test/asan/TestCases/poison_partial.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/poison_partial.cc rename to compiler-rt/test/asan/TestCases/poison_partial.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/print-stack-trace.cc b/compiler-rt/test/asan/TestCases/print-stack-trace.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/print-stack-trace.cc rename to compiler-rt/test/asan/TestCases/print-stack-trace.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/print_summary.cc b/compiler-rt/test/asan/TestCases/print_summary.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/print_summary.cc rename to compiler-rt/test/asan/TestCases/print_summary.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/printf-1.c b/compiler-rt/test/asan/TestCases/printf-1.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/printf-1.c rename to compiler-rt/test/asan/TestCases/printf-1.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/printf-2.c b/compiler-rt/test/asan/TestCases/printf-2.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/printf-2.c rename to compiler-rt/test/asan/TestCases/printf-2.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/printf-3.c b/compiler-rt/test/asan/TestCases/printf-3.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/printf-3.c rename to compiler-rt/test/asan/TestCases/printf-3.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/printf-4.c b/compiler-rt/test/asan/TestCases/printf-4.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/printf-4.c rename to compiler-rt/test/asan/TestCases/printf-4.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/printf-5.c b/compiler-rt/test/asan/TestCases/printf-5.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/printf-5.c rename to compiler-rt/test/asan/TestCases/printf-5.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/readv.cc b/compiler-rt/test/asan/TestCases/readv.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/readv.cc rename to compiler-rt/test/asan/TestCases/readv.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/sanity_check_pure_c.c b/compiler-rt/test/asan/TestCases/sanity_check_pure_c.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/sanity_check_pure_c.c rename to compiler-rt/test/asan/TestCases/sanity_check_pure_c.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/shared-lib-test.cc b/compiler-rt/test/asan/TestCases/shared-lib-test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/shared-lib-test.cc rename to compiler-rt/test/asan/TestCases/shared-lib-test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/sleep_before_dying.c b/compiler-rt/test/asan/TestCases/sleep_before_dying.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/sleep_before_dying.c rename to compiler-rt/test/asan/TestCases/sleep_before_dying.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/stack-buffer-overflow-with-position.cc b/compiler-rt/test/asan/TestCases/stack-buffer-overflow-with-position.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/stack-buffer-overflow-with-position.cc rename to compiler-rt/test/asan/TestCases/stack-buffer-overflow-with-position.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/stack-frame-demangle.cc b/compiler-rt/test/asan/TestCases/stack-frame-demangle.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/stack-frame-demangle.cc rename to compiler-rt/test/asan/TestCases/stack-frame-demangle.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/stack-oob-frames.cc b/compiler-rt/test/asan/TestCases/stack-oob-frames.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/stack-oob-frames.cc rename to compiler-rt/test/asan/TestCases/stack-oob-frames.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/stack-overflow.cc b/compiler-rt/test/asan/TestCases/stack-overflow.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/stack-overflow.cc rename to compiler-rt/test/asan/TestCases/stack-overflow.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/stack-use-after-return.cc b/compiler-rt/test/asan/TestCases/stack-use-after-return.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/stack-use-after-return.cc rename to compiler-rt/test/asan/TestCases/stack-use-after-return.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/start-deactivated.cc b/compiler-rt/test/asan/TestCases/start-deactivated.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/start-deactivated.cc rename to compiler-rt/test/asan/TestCases/start-deactivated.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/strdup_oob_test.cc b/compiler-rt/test/asan/TestCases/strdup_oob_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/strdup_oob_test.cc rename to compiler-rt/test/asan/TestCases/strdup_oob_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/strerror_r_test.cc b/compiler-rt/test/asan/TestCases/strerror_r_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/strerror_r_test.cc rename to compiler-rt/test/asan/TestCases/strerror_r_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/strip_path_prefix.c b/compiler-rt/test/asan/TestCases/strip_path_prefix.c similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/strip_path_prefix.c rename to compiler-rt/test/asan/TestCases/strip_path_prefix.c diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/strncpy-overflow.cc b/compiler-rt/test/asan/TestCases/strncpy-overflow.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/strncpy-overflow.cc rename to compiler-rt/test/asan/TestCases/strncpy-overflow.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/throw_call_test.cc b/compiler-rt/test/asan/TestCases/throw_call_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/throw_call_test.cc rename to compiler-rt/test/asan/TestCases/throw_call_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/throw_catch.cc b/compiler-rt/test/asan/TestCases/throw_catch.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/throw_catch.cc rename to compiler-rt/test/asan/TestCases/throw_catch.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/throw_invoke_test.cc b/compiler-rt/test/asan/TestCases/throw_invoke_test.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/throw_invoke_test.cc rename to compiler-rt/test/asan/TestCases/throw_invoke_test.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/time_interceptor.cc b/compiler-rt/test/asan/TestCases/time_interceptor.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/time_interceptor.cc rename to compiler-rt/test/asan/TestCases/time_interceptor.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/uar_and_exceptions.cc b/compiler-rt/test/asan/TestCases/uar_and_exceptions.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/uar_and_exceptions.cc rename to compiler-rt/test/asan/TestCases/uar_and_exceptions.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/unaligned_loads_and_stores.cc b/compiler-rt/test/asan/TestCases/unaligned_loads_and_stores.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/unaligned_loads_and_stores.cc rename to compiler-rt/test/asan/TestCases/unaligned_loads_and_stores.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free-right.cc b/compiler-rt/test/asan/TestCases/use-after-free-right.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/use-after-free-right.cc rename to compiler-rt/test/asan/TestCases/use-after-free-right.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free.cc b/compiler-rt/test/asan/TestCases/use-after-free.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/use-after-free.cc rename to compiler-rt/test/asan/TestCases/use-after-free.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-poison.cc b/compiler-rt/test/asan/TestCases/use-after-poison.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/use-after-poison.cc rename to compiler-rt/test/asan/TestCases/use-after-poison.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-dtor-order.cc b/compiler-rt/test/asan/TestCases/use-after-scope-dtor-order.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-dtor-order.cc rename to compiler-rt/test/asan/TestCases/use-after-scope-dtor-order.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-inlined.cc b/compiler-rt/test/asan/TestCases/use-after-scope-inlined.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-inlined.cc rename to compiler-rt/test/asan/TestCases/use-after-scope-inlined.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-nobug.cc b/compiler-rt/test/asan/TestCases/use-after-scope-nobug.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-nobug.cc rename to compiler-rt/test/asan/TestCases/use-after-scope-nobug.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-temp.cc b/compiler-rt/test/asan/TestCases/use-after-scope-temp.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-temp.cc rename to compiler-rt/test/asan/TestCases/use-after-scope-temp.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope.cc b/compiler-rt/test/asan/TestCases/use-after-scope.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope.cc rename to compiler-rt/test/asan/TestCases/use-after-scope.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/wait.cc b/compiler-rt/test/asan/TestCases/wait.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/wait.cc rename to compiler-rt/test/asan/TestCases/wait.cc diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/waitid.cc b/compiler-rt/test/asan/TestCases/waitid.cc similarity index 100% rename from compiler-rt/lib/asan/lit_tests/TestCases/waitid.cc rename to compiler-rt/test/asan/TestCases/waitid.cc diff --git a/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/test/asan/Unit/lit.site.cfg.in similarity index 86% rename from compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in rename to compiler-rt/test/asan/Unit/lit.site.cfg.in index f6d9ed9..96cfc386 100644 --- a/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in +++ b/compiler-rt/test/asan/Unit/lit.site.cfg.in @@ -9,7 +9,8 @@ config.name = 'AddressSanitizer-Unit' # Setup test source and exec root. For unit tests, we define # it as build directory with ASan unit tests. -config.test_exec_root = "@ASAN_BINARY_DIR@/tests" +# FIXME: De-hardcode this path. +config.test_exec_root = "@COMPILER_RT_BINARY_DIR@/lib/asan/tests" config.test_source_root = config.test_exec_root # Enable leak detection in ASan unit tests on x86_64-linux. diff --git a/compiler-rt/lib/asan/lit_tests/android_commands/android_common.py b/compiler-rt/test/asan/android_commands/android_common.py similarity index 100% rename from compiler-rt/lib/asan/lit_tests/android_commands/android_common.py rename to compiler-rt/test/asan/android_commands/android_common.py diff --git a/compiler-rt/lib/asan/lit_tests/android_commands/android_compile.py b/compiler-rt/test/asan/android_commands/android_compile.py similarity index 100% rename from compiler-rt/lib/asan/lit_tests/android_commands/android_compile.py rename to compiler-rt/test/asan/android_commands/android_compile.py diff --git a/compiler-rt/lib/asan/lit_tests/android_commands/android_run.py b/compiler-rt/test/asan/android_commands/android_run.py similarity index 100% rename from compiler-rt/lib/asan/lit_tests/android_commands/android_run.py rename to compiler-rt/test/asan/android_commands/android_run.py diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/test/asan/lit.cfg similarity index 64% rename from compiler-rt/lib/asan/lit_tests/lit.cfg rename to compiler-rt/test/asan/lit.cfg index de18cd6..4fa796b 100644 --- a/compiler-rt/lib/asan/lit_tests/lit.cfg +++ b/compiler-rt/test/asan/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 = 'AddressSanitizer' + config.name_suffix # 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-asan") - -# 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. - asan_site_cfg = lit_config.params.get('asan_site_config', None) - if (asan_site_cfg) and (os.path.exists(asan_site_cfg)): - lit_config.load_config(config, asan_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() - asan_site_cfg = os.path.join(llvm_obj_root, "projects", "compiler-rt", - "lib", "asan", "lit_tests", "lit.site.cfg") - if (not asan_site_cfg) or (not os.path.exists(asan_site_cfg)): - DisplayNoConfigMessage() - - lit_config.load_config(config, asan_site_cfg) - raise SystemExit - # Setup default compiler flags used with -fsanitize=address option. # FIXME: Review the set of required flags and check if it can be reduced. target_cflags = " " + config.target_cflags @@ -62,9 +28,10 @@ clang_asan_cflags = (" -fsanitize=address" + target_cflags) clang_asan_cxxflags = " --driver-mode=g++" + clang_asan_cflags +asan_lit_source_dir = get_required_attr(config, "asan_lit_source_dir") if config.android == "TRUE": config.available_features.add('android') - clang_wrapper = os.path.join(config.asan_source_dir, "lit_tests", + clang_wrapper = os.path.join(asan_lit_source_dir, "android_commands", "android_compile.py") + " " else: clang_wrapper = "" @@ -79,8 +46,10 @@ config.substitutions.append( ("%clangxx_asan ", (" " + clang_wrapper + config.cl clang_asan_cxxflags + " ")) ) +# FIXME: De-hardcode this path. +asan_source_dir = os.path.join( + get_required_attr(config, "compiler_rt_src_root"), "lib", "asan") # Setup path to asan_symbolize.py script. -asan_source_dir = get_required_attr(config, "asan_source_dir") asan_symbolize = os.path.join(asan_source_dir, "scripts", "asan_symbolize.py") if not os.path.exists(asan_symbolize): lit_config.fatal("Can't find script on path %r" % asan_symbolize) -- 2.7.4