diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -17,8 +17,7 @@ # test_source_root: The root path where tests are located. # test_exec_root: The root path where tests should be run. -config.test_source_root = os.path.join(config.lldb_src_root, 'packages', - 'Python', 'lldbsuite', 'test') +config.test_source_root = os.path.dirname(__file__) config.test_exec_root = config.test_source_root if 'Address' in config.llvm_use_sanitizer: diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -1488,7 +1488,8 @@ # Search recursively for test directories by assuming anything not # in a directory called Inputs contains tests. - file(GLOB_RECURSE to_process LIST_DIRECTORIES true ${directory}/*) + # Follow symlinks as some tests in lldb are structured that way. + file(GLOB_RECURSE to_process FOLLOW_SYMLINKS LIST_DIRECTORIES true ${directory}/*) foreach(lit_suite ${to_process}) if(NOT IS_DIRECTORY ${lit_suite}) continue()