100 files changed, 4 insertions, 3 deletions
diff --git a/compiler-rt/lib/asan/lit_tests/Darwin/interface_symbols_darwin.c b/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/interface_symbols_darwin.c
index 3fca6e91532..85bf7a5e02c 100644
--- a/compiler-rt/lib/asan/lit_tests/Darwin/interface_symbols_darwin.c
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/interface_symbols_darwin.c
@@ -16,7 +16,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/../../../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/Darwin/lit.local.cfg b/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/lit.local.cfg
index a85dfcd24c0..a85dfcd24c0 100644
--- a/compiler-rt/lib/asan/lit_tests/Darwin/lit.local.cfg
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/lit.local.cfg
diff --git a/compiler-rt/lib/asan/lit_tests/Darwin/reexec-insert-libraries-env.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/reexec-insert-libraries-env.cc
index 40a459fd84d..40a459fd84d 100644
--- a/compiler-rt/lib/asan/lit_tests/Darwin/reexec-insert-libraries-env.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/reexec-insert-libraries-env.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Darwin/unset-insert-libraries-on-exec.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/unset-insert-libraries-on-exec.cc
index cf89949cf94..cf89949cf94 100644
--- a/compiler-rt/lib/asan/lit_tests/Darwin/unset-insert-libraries-on-exec.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Darwin/unset-insert-libraries-on-exec.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/blacklist-extra.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/blacklist-extra.cc
index 627115cdda2..627115cdda2 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/blacklist-extra.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/blacklist-extra.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/init-order-atexit-extra.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/init-order-atexit-extra.cc
index e4189d19d09..e4189d19d09 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/init-order-atexit-extra.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/init-order-atexit-extra.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-blacklist-extra.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist-extra.cc
index 09aed2112d5..09aed2112d5 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-blacklist-extra.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist-extra.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-blacklist-extra2.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist-extra2.cc
index 69455a0a6fc..69455a0a6fc 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-blacklist-extra2.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist-extra2.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-blacklist.txt b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist.txt
index fa4a83667f4..fa4a83667f4 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-blacklist.txt
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-blacklist.txt
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-bug-extra.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-bug-extra.cc
index 3c4cb411def..3c4cb411def 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-bug-extra.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-bug-extra.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-bug-extra2.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-bug-extra2.cc
index a3d8f190e58..a3d8f190e58 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-bug-extra2.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-bug-extra2.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-constexpr-extra.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-constexpr-extra.cc
index b32466a981b..b32466a981b 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-constexpr-extra.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-constexpr-extra.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-nobug-extra.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-nobug-extra.cc
index 886165affd7..886165affd7 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/initialization-nobug-extra.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/initialization-nobug-extra.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Helpers/lit.local.cfg b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/lit.local.cfg
index 2fc4d99456b..2fc4d99456b 100644
--- a/compiler-rt/lib/asan/lit_tests/Helpers/lit.local.cfg
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Helpers/lit.local.cfg
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/asan_prelink_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/asan_prelink_test.cc
index c209c39c8c4..c209c39c8c4 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/asan_prelink_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/asan_prelink_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/clone_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/clone_test.cc
index ca13b22425f..ca13b22425f 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/clone_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/clone_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/glob.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob.cc
index e05228ff39e..e05228ff39e 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/glob.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/glob_test_root/aa b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/aa
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/glob_test_root/aa
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/aa
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/glob_test_root/ab b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/ab
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/glob_test_root/ab
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/ab
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/glob_test_root/ba b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/ba
index e69de29bb2d..e69de29bb2d 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/glob_test_root/ba
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/glob_test_root/ba
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/heavy_uar_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/heavy_uar_test.cc
index c0f4560fb4e..c0f4560fb4e 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/heavy_uar_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/heavy_uar_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/initialization-bug-any-order.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc
index 4f41dda1812..4f41dda1812 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/initialization-bug-any-order.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/interception_failure_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_failure_test.cc
index dfad909f528..dfad909f528 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/interception_failure_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_failure_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/interception_malloc_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_malloc_test.cc
index 8f66788e9a8..8f66788e9a8 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/interception_malloc_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_malloc_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/interception_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_test.cc
index 94fb499f2f8..94fb499f2f8 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/interception_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interception_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/interface_symbols_linux.c b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interface_symbols_linux.c
index 4134c874404..b5cfa09a1e3 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/interface_symbols_linux.c
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/interface_symbols_linux.c
@@ -8,7 +8,7 @@
 // RUN:    | grep -v "__asan_symbolize" \
 // RUN:    | grep -v "__asan_default_options" \
 // RUN:    | grep -v "__asan_on_error" > %t.symbols
-// RUN: cat %p/../../asan_interface_internal.h \
+// RUN: cat %p/../../../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/Linux/lit.local.cfg b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/lit.local.cfg
index 57271b8078a..57271b8078a 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/lit.local.cfg
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/lit.local.cfg
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/malloc-in-qsort.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc-in-qsort.cc
index ee2e81f0d2a..ee2e81f0d2a 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/malloc-in-qsort.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc-in-qsort.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/malloc_delete_mismatch.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc_delete_mismatch.cc
index f34b33a38fb..f34b33a38fb 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/malloc_delete_mismatch.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc_delete_mismatch.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/overflow-in-qsort.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/overflow-in-qsort.cc
index 8bc43ca0a5c..8bc43ca0a5c 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/overflow-in-qsort.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/overflow-in-qsort.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/preinit_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/preinit_test.cc
index 28e509472c0..28e509472c0 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/preinit_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/preinit_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/rlimit_mmap_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/rlimit_mmap_test.cc
index 86794756c76..86794756c76 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/rlimit_mmap_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/rlimit_mmap_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/swapcontext_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/swapcontext_test.cc
index 47a8d9891f5..47a8d9891f5 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/swapcontext_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/swapcontext_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/syscalls.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/syscalls.cc
index b2edcfb9237..b2edcfb9237 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/syscalls.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/syscalls.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/time_null_regtest.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/time_null_regtest.cc
index 975bca3d105..975bca3d105 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/time_null_regtest.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/time_null_regtest.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/unpoison_tls.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/unpoison_tls.cc
index 08e7d86f663..08e7d86f663 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/unpoison_tls.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/unpoison_tls.cc
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/zero-base-shadow.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow.cc
index 682e7e8d7e5..682e7e8d7e5 100644
--- a/compiler-rt/lib/asan/lit_tests/Linux/zero-base-shadow.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow.cc
diff --git a/compiler-rt/lib/asan/lit_tests/SharedLibs/darwin-dummy-shared-lib-so.cc b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/darwin-dummy-shared-lib-so.cc
index 5d939991476..5d939991476 100644
--- a/compiler-rt/lib/asan/lit_tests/SharedLibs/darwin-dummy-shared-lib-so.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/darwin-dummy-shared-lib-so.cc
diff --git a/compiler-rt/lib/asan/lit_tests/SharedLibs/dlclose-test-so.cc b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/dlclose-test-so.cc
index 73e00507358..73e00507358 100644
--- a/compiler-rt/lib/asan/lit_tests/SharedLibs/dlclose-test-so.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/dlclose-test-so.cc
diff --git a/compiler-rt/lib/asan/lit_tests/SharedLibs/init-order-dlopen-so.cc b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/init-order-dlopen-so.cc
index 20ef2d8a00b..20ef2d8a00b 100644
--- a/compiler-rt/lib/asan/lit_tests/SharedLibs/init-order-dlopen-so.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/init-order-dlopen-so.cc
diff --git a/compiler-rt/lib/asan/lit_tests/SharedLibs/lit.local.cfg b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/lit.local.cfg
index b3677c17a0f..b3677c17a0f 100644
--- a/compiler-rt/lib/asan/lit_tests/SharedLibs/lit.local.cfg
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/lit.local.cfg
diff --git a/compiler-rt/lib/asan/lit_tests/SharedLibs/shared-lib-test-so.cc b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/shared-lib-test-so.cc
index 686a2457808..686a2457808 100644
--- a/compiler-rt/lib/asan/lit_tests/SharedLibs/shared-lib-test-so.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/SharedLibs/shared-lib-test-so.cc
diff --git a/compiler-rt/lib/asan/lit_tests/allow_user_segv.cc b/compiler-rt/lib/asan/lit_tests/TestCases/allow_user_segv.cc
index f8aed0d4ca8..f8aed0d4ca8 100644
--- a/compiler-rt/lib/asan/lit_tests/allow_user_segv.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/allow_user_segv.cc
diff --git a/compiler-rt/lib/asan/lit_tests/blacklist.cc b/compiler-rt/lib/asan/lit_tests/TestCases/blacklist.cc
index 6cfc1500c50..6cfc1500c50 100644
--- a/compiler-rt/lib/asan/lit_tests/blacklist.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/blacklist.cc
diff --git a/compiler-rt/lib/asan/lit_tests/deep_stack_uaf.cc b/compiler-rt/lib/asan/lit_tests/TestCases/deep_stack_uaf.cc
index 7b32798fefc..7b32798fefc 100644
--- a/compiler-rt/lib/asan/lit_tests/deep_stack_uaf.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/deep_stack_uaf.cc
diff --git a/compiler-rt/lib/asan/lit_tests/deep_tail_call.cc b/compiler-rt/lib/asan/lit_tests/TestCases/deep_tail_call.cc
index 6aa15e81f6e..6aa15e81f6e 100644
--- a/compiler-rt/lib/asan/lit_tests/deep_tail_call.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/deep_tail_call.cc
diff --git a/compiler-rt/lib/asan/lit_tests/deep_thread_stack.cc b/compiler-rt/lib/asan/lit_tests/TestCases/deep_thread_stack.cc
index 781508d6161..781508d6161 100644
--- a/compiler-rt/lib/asan/lit_tests/deep_thread_stack.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/deep_thread_stack.cc
diff --git a/compiler-rt/lib/asan/lit_tests/default_blacklist.cc b/compiler-rt/lib/asan/lit_tests/TestCases/default_blacklist.cc
index 25a1ae1752b..25a1ae1752b 100644
--- a/compiler-rt/lib/asan/lit_tests/default_blacklist.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/default_blacklist.cc
diff --git a/compiler-rt/lib/asan/lit_tests/default_options.cc b/compiler-rt/lib/asan/lit_tests/TestCases/default_options.cc
index 84b80557b85..84b80557b85 100644
--- a/compiler-rt/lib/asan/lit_tests/default_options.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/default_options.cc
diff --git a/compiler-rt/lib/asan/lit_tests/dlclose-test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/dlclose-test.cc
index b15895bf357..b15895bf357 100644
--- a/compiler-rt/lib/asan/lit_tests/dlclose-test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/dlclose-test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/double-free.cc b/compiler-rt/lib/asan/lit_tests/TestCases/double-free.cc
index 9e201117c56..9e201117c56 100644
--- a/compiler-rt/lib/asan/lit_tests/double-free.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/double-free.cc
diff --git a/compiler-rt/lib/asan/lit_tests/force_inline_opt0.cc b/compiler-rt/lib/asan/lit_tests/TestCases/force_inline_opt0.cc
index 955ce38156f..955ce38156f 100644
--- a/compiler-rt/lib/asan/lit_tests/force_inline_opt0.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/force_inline_opt0.cc
diff --git a/compiler-rt/lib/asan/lit_tests/free_hook_realloc.cc b/compiler-rt/lib/asan/lit_tests/TestCases/free_hook_realloc.cc
index 92f5acd6dc8..92f5acd6dc8 100644
--- a/compiler-rt/lib/asan/lit_tests/free_hook_realloc.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/free_hook_realloc.cc
diff --git a/compiler-rt/lib/asan/lit_tests/global-demangle.cc b/compiler-rt/lib/asan/lit_tests/TestCases/global-demangle.cc
index 5696a38a770..5696a38a770 100644
--- a/compiler-rt/lib/asan/lit_tests/global-demangle.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/global-demangle.cc
diff --git a/compiler-rt/lib/asan/lit_tests/global-overflow.cc b/compiler-rt/lib/asan/lit_tests/TestCases/global-overflow.cc
index 6a2f12e106f..6a2f12e106f 100644
--- a/compiler-rt/lib/asan/lit_tests/global-overflow.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/global-overflow.cc
diff --git a/compiler-rt/lib/asan/lit_tests/heap-overflow.cc b/compiler-rt/lib/asan/lit_tests/TestCases/heap-overflow.cc
index f1d719cd0b2..f1d719cd0b2 100644
--- a/compiler-rt/lib/asan/lit_tests/heap-overflow.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/heap-overflow.cc
diff --git a/compiler-rt/lib/asan/lit_tests/huge_negative_hea_oob.cc b/compiler-rt/lib/asan/lit_tests/TestCases/huge_negative_hea_oob.cc
index a09e3bf87d6..a09e3bf87d6 100644
--- a/compiler-rt/lib/asan/lit_tests/huge_negative_hea_oob.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/huge_negative_hea_oob.cc
diff --git a/compiler-rt/lib/asan/lit_tests/init-order-atexit.cc b/compiler-rt/lib/asan/lit_tests/TestCases/init-order-atexit.cc
index 45f4f17c0cb..45f4f17c0cb 100644
--- a/compiler-rt/lib/asan/lit_tests/init-order-atexit.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/init-order-atexit.cc
diff --git a/compiler-rt/lib/asan/lit_tests/init-order-dlopen.cc b/compiler-rt/lib/asan/lit_tests/TestCases/init-order-dlopen.cc
index 228f44204c9..228f44204c9 100644
--- a/compiler-rt/lib/asan/lit_tests/init-order-dlopen.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/init-order-dlopen.cc
diff --git a/compiler-rt/lib/asan/lit_tests/initialization-blacklist.cc b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-blacklist.cc
index 12fbc49ed91..12fbc49ed91 100644
--- a/compiler-rt/lib/asan/lit_tests/initialization-blacklist.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-blacklist.cc
diff --git a/compiler-rt/lib/asan/lit_tests/initialization-bug.cc b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-bug.cc
index ee2c725f0b1..ee2c725f0b1 100644
--- a/compiler-rt/lib/asan/lit_tests/initialization-bug.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-bug.cc
diff --git a/compiler-rt/lib/asan/lit_tests/initialization-constexpr.cc b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-constexpr.cc
index ba5410674f7..ba5410674f7 100644
--- a/compiler-rt/lib/asan/lit_tests/initialization-constexpr.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-constexpr.cc
diff --git a/compiler-rt/lib/asan/lit_tests/initialization-nobug.cc b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-nobug.cc
index 407226e29a1..407226e29a1 100644
--- a/compiler-rt/lib/asan/lit_tests/initialization-nobug.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-nobug.cc
diff --git a/compiler-rt/lib/asan/lit_tests/interface_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/interface_test.cc
index 428a109fe70..428a109fe70 100644
--- a/compiler-rt/lib/asan/lit_tests/interface_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/interface_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/invalid-free.cc b/compiler-rt/lib/asan/lit_tests/TestCases/invalid-free.cc
index 0ef064056b6..0ef064056b6 100644
--- a/compiler-rt/lib/asan/lit_tests/invalid-free.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/invalid-free.cc
diff --git a/compiler-rt/lib/asan/lit_tests/large_func_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/large_func_test.cc
index ceecc29b7b0..ceecc29b7b0 100644
--- a/compiler-rt/lib/asan/lit_tests/large_func_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/large_func_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/log-path_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/log-path_test.cc
index 1072670fbff..1072670fbff 100644
--- a/compiler-rt/lib/asan/lit_tests/log-path_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/log-path_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/log_path_fork_test.cc.disabled b/compiler-rt/lib/asan/lit_tests/TestCases/log_path_fork_test.cc.disabled
index c6c1b49e994..c6c1b49e994 100644
--- a/compiler-rt/lib/asan/lit_tests/log_path_fork_test.cc.disabled
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/log_path_fork_test.cc.disabled
diff --git a/compiler-rt/lib/asan/lit_tests/malloc_fill.cc b/compiler-rt/lib/asan/lit_tests/TestCases/malloc_fill.cc
index c23516b3329..c23516b3329 100644
--- a/compiler-rt/lib/asan/lit_tests/malloc_fill.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/malloc_fill.cc
diff --git a/compiler-rt/lib/asan/lit_tests/malloc_hook.cc b/compiler-rt/lib/asan/lit_tests/TestCases/malloc_hook.cc
index 83be1020ea4..83be1020ea4 100644
--- a/compiler-rt/lib/asan/lit_tests/malloc_hook.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/malloc_hook.cc
diff --git a/compiler-rt/lib/asan/lit_tests/memcmp_strict_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_strict_test.cc
index 00bf921c744..00bf921c744 100644
--- a/compiler-rt/lib/asan/lit_tests/memcmp_strict_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_strict_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/memcmp_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_test.cc
index ac3f7f32ea7..ac3f7f32ea7 100644
--- a/compiler-rt/lib/asan/lit_tests/memcmp_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/null_deref.cc b/compiler-rt/lib/asan/lit_tests/TestCases/null_deref.cc
index 60a521d1c21..60a521d1c21 100644
--- a/compiler-rt/lib/asan/lit_tests/null_deref.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/null_deref.cc
diff --git a/compiler-rt/lib/asan/lit_tests/on_error_callback.cc b/compiler-rt/lib/asan/lit_tests/TestCases/on_error_callback.cc
index bb94d9fb579..bb94d9fb579 100644
--- a/compiler-rt/lib/asan/lit_tests/on_error_callback.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/on_error_callback.cc
diff --git a/compiler-rt/lib/asan/lit_tests/partial_right.cc b/compiler-rt/lib/asan/lit_tests/TestCases/partial_right.cc
index c579262726f..c579262726f 100644
--- a/compiler-rt/lib/asan/lit_tests/partial_right.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/partial_right.cc
diff --git a/compiler-rt/lib/asan/lit_tests/sanity_check_pure_c.c b/compiler-rt/lib/asan/lit_tests/TestCases/sanity_check_pure_c.c
index 3d830653e33..3d830653e33 100644
--- a/compiler-rt/lib/asan/lit_tests/sanity_check_pure_c.c
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/sanity_check_pure_c.c
diff --git a/compiler-rt/lib/asan/lit_tests/shared-lib-test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/shared-lib-test.cc
index 05bf3ecdf4f..05bf3ecdf4f 100644
--- a/compiler-rt/lib/asan/lit_tests/shared-lib-test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/shared-lib-test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/sleep_before_dying.c b/compiler-rt/lib/asan/lit_tests/TestCases/sleep_before_dying.c
index df9eba27603..df9eba27603 100644
--- a/compiler-rt/lib/asan/lit_tests/sleep_before_dying.c
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/sleep_before_dying.c
diff --git a/compiler-rt/lib/asan/lit_tests/stack-frame-demangle.cc b/compiler-rt/lib/asan/lit_tests/TestCases/stack-frame-demangle.cc
index bb8de16b2b8..bb8de16b2b8 100644
--- a/compiler-rt/lib/asan/lit_tests/stack-frame-demangle.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/stack-frame-demangle.cc
diff --git a/compiler-rt/lib/asan/lit_tests/stack-oob-frames.cc b/compiler-rt/lib/asan/lit_tests/TestCases/stack-oob-frames.cc
index 0395522252e..0395522252e 100644
--- a/compiler-rt/lib/asan/lit_tests/stack-oob-frames.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/stack-oob-frames.cc
diff --git a/compiler-rt/lib/asan/lit_tests/stack-overflow.cc b/compiler-rt/lib/asan/lit_tests/TestCases/stack-overflow.cc
index 25ea43af48a..25ea43af48a 100644
--- a/compiler-rt/lib/asan/lit_tests/stack-overflow.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/stack-overflow.cc
diff --git a/compiler-rt/lib/asan/lit_tests/stack-use-after-return.cc b/compiler-rt/lib/asan/lit_tests/TestCases/stack-use-after-return.cc
index f8d8a1a2ae3..f8d8a1a2ae3 100644
--- a/compiler-rt/lib/asan/lit_tests/stack-use-after-return.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/stack-use-after-return.cc
diff --git a/compiler-rt/lib/asan/lit_tests/strip_path_prefix.c b/compiler-rt/lib/asan/lit_tests/TestCases/strip_path_prefix.c
index ef7bf98ab3c..ef7bf98ab3c 100644
--- a/compiler-rt/lib/asan/lit_tests/strip_path_prefix.c
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/strip_path_prefix.c
diff --git a/compiler-rt/lib/asan/lit_tests/strncpy-overflow.cc b/compiler-rt/lib/asan/lit_tests/TestCases/strncpy-overflow.cc
index 5133b5c1653..5133b5c1653 100644
--- a/compiler-rt/lib/asan/lit_tests/strncpy-overflow.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/strncpy-overflow.cc
diff --git a/compiler-rt/lib/asan/lit_tests/symbolize_callback.cc b/compiler-rt/lib/asan/lit_tests/TestCases/symbolize_callback.cc
index 0691d501e24..0691d501e24 100644
--- a/compiler-rt/lib/asan/lit_tests/symbolize_callback.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/symbolize_callback.cc
diff --git a/compiler-rt/lib/asan/lit_tests/throw_call_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/throw_call_test.cc
index 974bc51d97c..974bc51d97c 100644
--- a/compiler-rt/lib/asan/lit_tests/throw_call_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/throw_call_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/throw_invoke_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/throw_invoke_test.cc
index 077a940e8d1..077a940e8d1 100644
--- a/compiler-rt/lib/asan/lit_tests/throw_invoke_test.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/throw_invoke_test.cc
diff --git a/compiler-rt/lib/asan/lit_tests/time_interceptor.cc b/compiler-rt/lib/asan/lit_tests/TestCases/time_interceptor.cc
index f5f2ad62b81..f5f2ad62b81 100644
--- a/compiler-rt/lib/asan/lit_tests/time_interceptor.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/time_interceptor.cc
diff --git a/compiler-rt/lib/asan/lit_tests/unaligned_loads_and_stores.cc b/compiler-rt/lib/asan/lit_tests/TestCases/unaligned_loads_and_stores.cc
index bcae089b427..bcae089b427 100644
--- a/compiler-rt/lib/asan/lit_tests/unaligned_loads_and_stores.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/unaligned_loads_and_stores.cc
diff --git a/compiler-rt/lib/asan/lit_tests/use-after-free-right.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free-right.cc
index b0de07b04a0..b0de07b04a0 100644
--- a/compiler-rt/lib/asan/lit_tests/use-after-free-right.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free-right.cc
diff --git a/compiler-rt/lib/asan/lit_tests/use-after-free.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free.cc
index aee185dc451..aee185dc451 100644
--- a/compiler-rt/lib/asan/lit_tests/use-after-free.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free.cc
diff --git a/compiler-rt/lib/asan/lit_tests/use-after-poison.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-poison.cc
index d8734290024..d8734290024 100644
--- a/compiler-rt/lib/asan/lit_tests/use-after-poison.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-poison.cc
diff --git a/compiler-rt/lib/asan/lit_tests/use-after-scope-dtor-order.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-dtor-order.cc
index 15e1fce81e5..15e1fce81e5 100644
--- a/compiler-rt/lib/asan/lit_tests/use-after-scope-dtor-order.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-dtor-order.cc
diff --git a/compiler-rt/lib/asan/lit_tests/use-after-scope-inlined.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-inlined.cc
index 5c121ea187e..5c121ea187e 100644
--- a/compiler-rt/lib/asan/lit_tests/use-after-scope-inlined.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-inlined.cc
diff --git a/compiler-rt/lib/asan/lit_tests/use-after-scope-nobug.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-nobug.cc
index 56a2756011c..56a2756011c 100644
--- a/compiler-rt/lib/asan/lit_tests/use-after-scope-nobug.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-nobug.cc
diff --git a/compiler-rt/lib/asan/lit_tests/use-after-scope-temp.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-temp.cc
index 3575188bd8c..3575188bd8c 100644
--- a/compiler-rt/lib/asan/lit_tests/use-after-scope-temp.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-temp.cc
diff --git a/compiler-rt/lib/asan/lit_tests/use-after-scope.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope.cc
index a19f20fe129..a19f20fe129 100644
--- a/compiler-rt/lib/asan/lit_tests/use-after-scope.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope.cc
diff --git a/compiler-rt/lib/asan/lit_tests/wait.cc b/compiler-rt/lib/asan/lit_tests/TestCases/wait.cc
index 88fbb17176f..88fbb17176f 100644
--- a/compiler-rt/lib/asan/lit_tests/wait.cc
+++ b/compiler-rt/lib/asan/lit_tests/TestCases/wait.cc
diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/lib/asan/lit_tests/lit.cfg
index 5daecd9e557..d8dac43a4c7 100644
--- a/compiler-rt/lib/asan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/asan/lit_tests/lit.cfg
@@ -77,7 +77,7 @@ if llvm_tools_dir:
 # Setup path to symbolizer script.
 # FIXME: Instead we should copy this script to the build tree and point
 #        at it there.
-asan_source_dir = os.path.join(config.test_source_root, "..")
+asan_source_dir = get_required_attr(config, "asan_source_dir")
 symbolizer = os.path.join(asan_source_dir,
                          'scripts', 'asan_symbolize.py')
 if not os.path.exists(symbolizer):
diff --git a/compiler-rt/lib/asan/lit_tests/lit.site.cfg.in b/compiler-rt/lib/asan/lit_tests/lit.site.cfg.in
index 08546cdabe0..528412246f3 100644
--- a/compiler-rt/lib/asan/lit_tests/lit.site.cfg.in
+++ b/compiler-rt/lib/asan/lit_tests/lit.site.cfg.in
@@ -9,6 +9,7 @@ config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.clang = "@LLVM_BINARY_DIR@/bin/clang"
 config.compiler_rt_arch = "@COMPILER_RT_SUPPORTED_ARCH@"
+config.asan_source_dir = "@ASAN_SOURCE_DIR@"
 
 # LLVM tools dir can be passed in lit parameters, so try to
 # apply substitution.