450 files changed, 331 insertions, 258 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
index 317643a4422..58a7ef1a9a7 100644
--- a/lldb/CMakeLists.txt
+++ b/lldb/CMakeLists.txt
@@ -185,7 +185,6 @@ if(LLDB_INCLUDE_TESTS)
 
   add_subdirectory(test)
   add_subdirectory(unittests)
-  add_subdirectory(lit)
   add_subdirectory(utils/lit-cpuid)
   add_subdirectory(utils/lldb-dotest)
 endif()
diff --git a/lldb/lit/CMakeLists.txt b/lldb/lit/CMakeLists.txt
deleted file mode 100644
index 3e759b0e187..00000000000
--- a/lldb/lit/CMakeLists.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-# Test runner infrastructure for LLDB. This configures the LLDB test trees
-# for use by Lit, and delegates to LLVM's lit test handlers.
-
-# LLVM_BUILD_MODE is used in lit.site.cfg
-if (CMAKE_CFG_INTDIR STREQUAL ".")
-  set(LLVM_BUILD_MODE ".")
-else ()
-  set(LLVM_BUILD_MODE "%(build_mode)s")
-endif ()
-
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(LLDB_IS_64_BITS 1)
-endif()
-
-get_property(LLDB_DOTEST_ARGS GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY)
-set(dotest_args_replacement ${LLVM_BUILD_MODE})
-
-set(LLDB_TEST_MODULE_CACHE_LLDB "${LLDB_TEST_BUILD_DIRECTORY}/module-cache-lldb" CACHE PATH "The Clang module cache used by the Clang embedded in LLDB while running tests.")
-set(LLDB_TEST_MODULE_CACHE_CLANG "${LLDB_TEST_BUILD_DIRECTORY}/module-cache-clang" CACHE PATH "The Clang module cache used by the Clang while building tests.")
-
-if(LLDB_BUILT_STANDALONE)
-  # In paths to our build-tree, replace CMAKE_CFG_INTDIR with our configuration name placeholder.
-  string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} config_runtime_output_dir ${LLVM_RUNTIME_OUTPUT_INTDIR})
-  string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_DOTEST_ARGS "${LLDB_DOTEST_ARGS}")
-
-  # Remaining ones must be paths to the provided LLVM build-tree.
-  if(LLVM_CONFIGURATION_TYPES)
-    # LLDB uses single-config; LLVM multi-config; pick one and prefer Release types.
-    # Otherwise, if both use multi-config the default is fine.
-    if(NOT CMAKE_CONFIGURATION_TYPES)
-      if(RelWithDebInfo IN_LIST LLVM_CONFIGURATION_TYPES)
-        set(dotest_args_replacement RelWithDebInfo)
-      elseif(Release IN_LIST LLVM_CONFIGURATION_TYPES)
-        set(dotest_args_replacement Release)
-      else()
-        list(GET LLVM_CONFIGURATION_TYPES 0 dotest_args_replacement)
-      endif()
-    endif()
-  else()
-    # Common case: LLVM used a single-configuration generator like Ninja.
-    set(dotest_args_replacement ".")
-  endif()
-endif()
-
-string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_DOTEST_ARGS "${LLDB_DOTEST_ARGS}")
-string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_LIBS_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
-string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-
-add_lldb_test_dependency(
-  lit-cpuid
-  llc
-  lli
-  llvm-config
-  llvm-dwarfdump
-  llvm-nm
-  llvm-mc
-  llvm-objcopy
-  llvm-readobj
-  llvm-strip
-  )
-
-if(TARGET lld)
-  add_lldb_test_dependency(lld)
-endif()
-
-# the value is not canonicalized within LLVM
-llvm_canonicalize_cmake_booleans(
-  LLDB_DISABLE_PYTHON
-  LLVM_ENABLE_ZLIB
-  LLVM_ENABLE_SHARED_LIBS
-  LLDB_IS_64_BITS)
-
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
-  MAIN_CONFIG
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py)
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
-  ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
-  MAIN_CONFIG
-  ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py)
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/Suite/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/Suite/lit.site.cfg)
-
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit-lldb-init.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit-lldb-init)
-
-if(NOT LLDB_BUILT_STANDALONE)
-  add_lldb_test_dependency(
-    FileCheck
-    count
-    not
-  )
-endif()
-
-add_lit_testsuite(check-lldb-lit "Running lldb lit test suite"
-  ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS lldb-test-deps
-  )
-
-set_target_properties(check-lldb-lit PROPERTIES FOLDER "lldb tests")
-
-# If we're building with an in-tree clang, then list clang as a dependency
-# to run tests.
-if (TARGET clang)
-  add_dependencies(check-lldb-lit clang)
-endif()
-
-add_lit_testsuites(LLDB
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  DEPENDS lldb-test-deps
-  )
diff --git a/lldb/test/API/CMakeLists.txt b/lldb/test/API/CMakeLists.txt
new file mode 100644
index 00000000000..4f787d21fd3
--- /dev/null
+++ b/lldb/test/API/CMakeLists.txt
@@ -0,0 +1,133 @@
+function(add_python_test_target name test_script args comment)
+  set(PYTHON_TEST_COMMAND
+    ${PYTHON_EXECUTABLE}
+    ${test_script}
+    ${args}
+    )
+
+  add_custom_target(${name}
+    COMMAND ${PYTHON_TEST_COMMAND} ${ARG_DEFAULT_ARGS}
+    COMMENT "${comment}"
+    USES_TERMINAL
+    )
+  add_dependencies(${name} lldb-test-deps)
+endfunction()
+
+# The default architecture with which to compile test executables is the default LLVM target
+# architecture, which itself defaults to the host architecture.
+string(TOLOWER "${LLVM_TARGET_ARCH}" LLDB_DEFAULT_TEST_ARCH)
+if( LLDB_DEFAULT_TEST_ARCH STREQUAL "host" )
+  string(REGEX MATCH "^[^-]*" LLDB_DEFAULT_TEST_ARCH ${LLVM_HOST_TRIPLE})
+endif ()
+
+# Allow the user to override the default by setting LLDB_TEST_ARCH
+set(LLDB_TEST_ARCH
+  ${LLDB_DEFAULT_TEST_ARCH}
+  CACHE STRING "Specify the architecture to run LLDB tests as (x86|x64).  Determines whether tests are compiled with -m32 or -m64")
+
+# Users can override LLDB_TEST_USER_ARGS to specify arbitrary arguments to pass to the script
+set(LLDB_TEST_USER_ARGS
+  ""
+  CACHE STRING "Specify additional arguments to pass to test runner. For example: '-C gcc -C clang -A i386 -A x86_64'")
+
+# The .noindex suffix is a marker for Spotlight to never index the
+# build directory.  LLDB queries Spotlight to locate .dSYM bundles
+# based on the UUID embedded in a binary, and because the UUID is a
+# hash of filename and .text section, there *will* be conflicts inside
+# the build directory.
+set(LLDB_TEST_COMMON_ARGS
+  --arch=${LLDB_TEST_ARCH}
+  -s
+  ${CMAKE_BINARY_DIR}/lldb-test-traces
+  -S nm
+  -u CXXFLAGS
+  -u CFLAGS
+  )
+
+list(APPEND LLDB_TEST_COMMON_ARGS
+  --executable ${LLDB_TEST_EXECUTABLE}
+  --dsymutil ${LLDB_TEST_DSYMUTIL}
+  --filecheck ${LLDB_TEST_FILECHECK}
+  -C ${LLDB_TEST_C_COMPILER}
+  )
+
+if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+  # All tests are currently flaky on Windows, so rerun them all once when they fail.
+  set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --rerun-all-issues)
+
+  set(LLDB_TEST_DEBUG_TEST_CRASHES
+    0
+    CACHE BOOL "(Windows only) Enables debugging of tests in the test suite by showing the crash dialog when lldb crashes")
+
+  set(LLDB_TEST_HIDE_CONSOLE_WINDOWS
+    1
+    CACHE BOOL "(Windows only) Hides the console window for an inferior when it is launched through the test suite")
+
+  if (LLDB_TEST_DEBUG_TEST_CRASHES)
+    set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --enable-crash-dialog)
+  endif()
+
+  if (NOT LLDB_TEST_HIDE_CONSOLE_WINDOWS)
+    set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --show-inferior-console)
+  endif()
+endif()
+
+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows|Darwin")
+  list(APPEND LLDB_TEST_COMMON_ARGS
+    --env ARCHIVER=${CMAKE_AR} --env OBJCOPY=${CMAKE_OBJCOPY})
+endif()
+
+if (NOT "${LLDB_LIT_TOOLS_DIR}" STREQUAL "")
+  if (NOT EXISTS "${LLDB_LIT_TOOLS_DIR}")
+    message(WARNING "LLDB_LIT_TOOLS_DIR ${LLDB_LIT_TOOLS_DIR} does not exist.")
+  endif()
+endif()
+
+if(CMAKE_HOST_APPLE)
+  if(LLDB_BUILD_FRAMEWORK)
+    get_target_property(framework_build_dir liblldb LIBRARY_OUTPUT_DIRECTORY)
+    list(APPEND LLDB_TEST_COMMON_ARGS --framework ${framework_build_dir}/LLDB.framework)
+  endif()
+
+  # Use the same identity for testing
+  get_property(code_sign_identity_used GLOBAL PROPERTY LLDB_DEBUGSERVER_CODESIGN_IDENTITY)
+  if(code_sign_identity_used)
+    list(APPEND LLDB_TEST_COMMON_ARGS --codesign-identity "${code_sign_identity_used}")
+  endif()
+
+  if(LLDB_USE_SYSTEM_DEBUGSERVER)
+    lldb_find_system_debugserver(system_debugserver_path)
+    add_custom_target(debugserver
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+      ${system_debugserver_path} ${LLVM_RUNTIME_OUTPUT_INTDIR}
+      COMMENT "Copying the system debugserver to LLDB's binaries directory for testing.")
+    # The custom target for the system debugserver has no install target, so we
+    # need to remove it from the LLVM_DISTRIBUTION_COMPONENTS list.
+    if (LLVM_DISTRIBUTION_COMPONENTS)
+      list(REMOVE_ITEM LLVM_DISTRIBUTION_COMPONENTS debugserver)
+      set(LLVM_DISTRIBUTION_COMPONENTS ${LLVM_DISTRIBUTION_COMPONENTS} PARENT_SCOPE)
+    endif()
+    message(STATUS "LLDB tests use out-of-tree debugserver: ${system_debugserver_path}")
+    list(APPEND LLDB_TEST_COMMON_ARGS --out-of-tree-debugserver)
+    add_lldb_test_dependency(debugserver)
+  elseif(TARGET debugserver)
+    set(debugserver_path ${LLVM_RUNTIME_OUTPUT_INTDIR}/debugserver)
+    message(STATUS "LLDB Tests use just-built debugserver: ${debugserver_path}")
+    list(APPEND LLDB_TEST_COMMON_ARGS --server ${debugserver_path})
+    add_lldb_test_dependency(debugserver)
+  elseif(TARGET lldb-server)
+    set(lldb_server_path ${LLVM_RUNTIME_OUTPUT_INTDIR}/lldb-server)
+    message(STATUS "LLDB Tests use just-built lldb-server: ${lldb_server_path}")
+    list(APPEND LLDB_TEST_COMMON_ARGS --server ${lldb_server_path})
+    add_lldb_test_dependency(lldb-server)
+  else()
+    message(WARNING "LLDB Tests enabled, but no server available")
+  endif()
+endif()
+
+set(LLDB_DOTEST_ARGS ${LLDB_TEST_COMMON_ARGS};${LLDB_TEST_USER_ARGS})
+set_property(GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY ${LLDB_DOTEST_ARGS})
+
+# This will add LLDB's test dependencies to the dependencies for check-all and
+# include them in the test-depends target.
+set_property(GLOBAL APPEND PROPERTY LLVM_LIT_DEPENDS ${ARG_DEPENDS})
diff --git a/lldb/test/API/README.md b/lldb/test/API/README.md
new file mode 100644
index 00000000000..fbb37136e26
--- /dev/null
+++ b/lldb/test/API/README.md
@@ -0,0 +1,4 @@
+# LLDB API Tests
+
+This directory only exists for the lit test driver. The actual tests live in
+the `tests` directory in top level LLDB directory.
diff --git a/lldb/test/dotest.py b/lldb/test/API/dotest.py
index 1f9d52354f5..1f9d52354f5 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/API/dotest.py
diff --git a/lldb/lit/Suite/lit.cfg b/lldb/test/API/lit.cfg
index 9504f4ca1d8..bb9e3aaaaa4 100644
--- a/lldb/lit/Suite/lit.cfg
+++ b/lldb/test/API/lit.cfg
@@ -9,7 +9,7 @@ import shlex
 import lit.formats
 
 # name: The name of this test suite.
-config.name = 'lldb-Suite'
+config.name = 'lldb-api'
 
 # suffixes: A list of file extensions to treat as test files.
 config.suffixes = ['.py']
@@ -73,7 +73,7 @@ if config.lldb_module_cache:
   dotest_cmd += ['--module-cache-dir', config.lldb_module_cache]
 
 # Load LLDB test format.
-sys.path.append(os.path.join(config.lldb_src_root, "lit", "Suite"))
+sys.path.append(os.path.join(config.lldb_src_root, "test", "API"))
 import lldbtest
 
 # testFormat: The test format to use to interpret tests.
diff --git a/lldb/lit/Suite/lit.site.cfg.in b/lldb/test/API/lit.site.cfg.in
index 306967d61fd..883bc403300 100644
--- a/lldb/lit/Suite/lit.site.cfg.in
+++ b/lldb/test/API/lit.site.cfg.in
@@ -20,7 +20,7 @@ config.lldb_build_directory = "@LLDB_TEST_BUILD_DIRECTORY@"
 config.lldb_module_cache = "@LLDB_TEST_MODULE_CACHE_LLDB@"
 config.clang_module_cache = "@LLDB_TEST_MODULE_CACHE_CLANG@"
 config.python_executable = "@PYTHON_EXECUTABLE@"
-config.dotest_path = "@LLDB_SOURCE_DIR@/test/dotest.py"
+config.dotest_path = "@LLDB_SOURCE_DIR@/test/API/dotest.py"
 config.dotest_args_str = "@LLDB_DOTEST_ARGS@"
 config.lldb_disable_python = @LLDB_DISABLE_PYTHON@
 config.dotest_lit_args_str = None
@@ -43,4 +43,4 @@ except KeyError as e:
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
 # Let the main config do the real work.
-lit_config.load_config(config, "@LLDB_SOURCE_DIR@/lit/Suite/lit.cfg")
+lit_config.load_config(config, "@LLDB_SOURCE_DIR@/test/API/lit.cfg")
diff --git a/lldb/lit/Suite/lldbtest.py b/lldb/test/API/lldbtest.py
index 99eb1457259..99eb1457259 100644
--- a/lldb/lit/Suite/lldbtest.py
+++ b/lldb/test/API/lldbtest.py
diff --git a/lldb/test/testcases b/lldb/test/API/testcases
index f4a13dceb79..f4a13dceb79 120000
--- a/lldb/test/testcases
+++ b/lldb/test/API/testcases
diff --git a/lldb/test/use_lldb_suite.py b/lldb/test/API/use_lldb_suite.py
index 6a8c12d8189..6a8c12d8189 100644
--- a/lldb/test/use_lldb_suite.py
+++ b/lldb/test/API/use_lldb_suite.py
diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt
index 7080dc45204..d54e9ce010b 100644
--- a/lldb/test/CMakeLists.txt
+++ b/lldb/test/CMakeLists.txt
@@ -1,149 +1,127 @@
-function(add_python_test_target name test_script args comment)
-  set(PYTHON_TEST_COMMAND
-    ${PYTHON_EXECUTABLE}
-    ${test_script}
-    ${args}
-    )
-
-  add_custom_target(${name}
-    COMMAND ${PYTHON_TEST_COMMAND} ${ARG_DEFAULT_ARGS}
-    COMMENT "${comment}"
-    USES_TERMINAL
-    )
-  add_dependencies(${name} lldb-test-deps)
-endfunction()
-
-# The default architecture with which to compile test executables is the default LLVM target
-# architecture, which itself defaults to the host architecture.
-string(TOLOWER "${LLVM_TARGET_ARCH}" LLDB_DEFAULT_TEST_ARCH)
-if( LLDB_DEFAULT_TEST_ARCH STREQUAL "host" )
-  string(REGEX MATCH "^[^-]*" LLDB_DEFAULT_TEST_ARCH ${LLVM_HOST_TRIPLE})
-endif ()
-
-# Allow the user to override the default by setting LLDB_TEST_ARCH
-set(LLDB_TEST_ARCH
-  ${LLDB_DEFAULT_TEST_ARCH}
-  CACHE STRING "Specify the architecture to run LLDB tests as (x86|x64).  Determines whether tests are compiled with -m32 or -m64")
-
-# Users can override LLDB_TEST_USER_ARGS to specify arbitrary arguments to pass to the script
-set(LLDB_TEST_USER_ARGS
-  ""
-  CACHE STRING "Specify additional arguments to pass to test runner. For example: '-C gcc -C clang -A i386 -A x86_64'")
-
-# The .noindex suffix is a marker for Spotlight to never index the
-# build directory.  LLDB queries Spotlight to locate .dSYM bundles
-# based on the UUID embedded in a binary, and because the UUID is a
-# hash of filename and .text section, there *will* be conflicts inside
-# the build directory.
-set(LLDB_TEST_COMMON_ARGS
-  --arch=${LLDB_TEST_ARCH}
-  -s
-  ${CMAKE_BINARY_DIR}/lldb-test-traces
-  -S nm
-  -u CXXFLAGS
-  -u CFLAGS
-  )
-
-list(APPEND LLDB_TEST_COMMON_ARGS
-  --executable ${LLDB_TEST_EXECUTABLE}
-  --dsymutil ${LLDB_TEST_DSYMUTIL}
-  --filecheck ${LLDB_TEST_FILECHECK}
-  -C ${LLDB_TEST_C_COMPILER}
-  )
-
-if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
-  # All tests are currently flaky on Windows, so rerun them all once when they fail.
-  set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --rerun-all-issues)
+# Test runner infrastructure for LLDB. This configures the LLDB test trees
+# for use by Lit, and delegates to LLVM's lit test handlers.
 
-  set(LLDB_TEST_DEBUG_TEST_CRASHES
-    0
-    CACHE BOOL "(Windows only) Enables debugging of tests in the test suite by showing the crash dialog when lldb crashes")
+add_subdirectory(API)
 
-  set(LLDB_TEST_HIDE_CONSOLE_WINDOWS
-    1
-    CACHE BOOL "(Windows only) Hides the console window for an inferior when it is launched through the test suite")
+# LLVM_BUILD_MODE is used in lit.site.cfg
+if (CMAKE_CFG_INTDIR STREQUAL ".")
+  set(LLVM_BUILD_MODE ".")
+else ()
+  set(LLVM_BUILD_MODE "%(build_mode)s")
+endif ()
 
-  if (LLDB_TEST_DEBUG_TEST_CRASHES)
-    set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --enable-crash-dialog)
-  endif()
+if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(LLDB_IS_64_BITS 1)
+endif()
 
-  if (NOT LLDB_TEST_HIDE_CONSOLE_WINDOWS)
-    set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --show-inferior-console)
+get_property(LLDB_DOTEST_ARGS GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY)
+set(dotest_args_replacement ${LLVM_BUILD_MODE})
+
+set(LLDB_TEST_MODULE_CACHE_LLDB "${LLDB_TEST_BUILD_DIRECTORY}/module-cache-lldb" CACHE PATH "The Clang module cache used by the Clang embedded in LLDB while running tests.")
+set(LLDB_TEST_MODULE_CACHE_CLANG "${LLDB_TEST_BUILD_DIRECTORY}/module-cache-clang" CACHE PATH "The Clang module cache used by the Clang while building tests.")
+
+if(LLDB_BUILT_STANDALONE)
+  # In paths to our build-tree, replace CMAKE_CFG_INTDIR with our configuration name placeholder.
+  string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} config_runtime_output_dir ${LLVM_RUNTIME_OUTPUT_INTDIR})
+  string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_DOTEST_ARGS "${LLDB_DOTEST_ARGS}")
+
+  # Remaining ones must be paths to the provided LLVM build-tree.
+  if(LLVM_CONFIGURATION_TYPES)
+    # LLDB uses single-config; LLVM multi-config; pick one and prefer Release types.
+    # Otherwise, if both use multi-config the default is fine.
+    if(NOT CMAKE_CONFIGURATION_TYPES)
+      if(RelWithDebInfo IN_LIST LLVM_CONFIGURATION_TYPES)
+        set(dotest_args_replacement RelWithDebInfo)
+      elseif(Release IN_LIST LLVM_CONFIGURATION_TYPES)
+        set(dotest_args_replacement Release)
+      else()
+        list(GET LLVM_CONFIGURATION_TYPES 0 dotest_args_replacement)
+      endif()
+    endif()
+  else()
+    # Common case: LLVM used a single-configuration generator like Ninja.
+    set(dotest_args_replacement ".")
   endif()
 endif()
 
-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows|Darwin")
-  list(APPEND LLDB_TEST_COMMON_ARGS
-    --env ARCHIVER=${CMAKE_AR} --env OBJCOPY=${CMAKE_OBJCOPY})
-endif()
+string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_DOTEST_ARGS "${LLDB_DOTEST_ARGS}")
+string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_LIBS_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
+string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
+
+add_lldb_test_dependency(
+  lit-cpuid
+  llc
+  lli
+  llvm-config
+  llvm-dwarfdump
+  llvm-nm
+  llvm-mc
+  llvm-objcopy
+  llvm-readobj
+  llvm-strip
+  )
 
-if (NOT "${LLDB_LIT_TOOLS_DIR}" STREQUAL "")
-  if (NOT EXISTS "${LLDB_LIT_TOOLS_DIR}")
-    message(WARNING "LLDB_LIT_TOOLS_DIR ${LLDB_LIT_TOOLS_DIR} does not exist.")
+if(TARGET lld)
+  add_lldb_test_dependency(lld)
+else()
+  # LLD is required to link test executables on Windows.
+  if (CMAKE_SYSTEM_NAME MATCHES "Windows")
+    message(WARNING "lld required to test LLDB on Windows")
   endif()
 endif()
 
-if(CMAKE_HOST_APPLE)
-  if(LLDB_BUILD_FRAMEWORK)
-    get_target_property(framework_build_dir liblldb LIBRARY_OUTPUT_DIRECTORY)
-    list(APPEND LLDB_TEST_COMMON_ARGS --framework ${framework_build_dir}/LLDB.framework)
-  endif()
+# the value is not canonicalized within LLVM
+llvm_canonicalize_cmake_booleans(
+  LLDB_DISABLE_PYTHON
+  LLVM_ENABLE_ZLIB
+  LLVM_ENABLE_SHARED_LIBS
+  LLDB_IS_64_BITS)
+
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.site.cfg.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Shell/lit.site.cfg.py
+  MAIN_CONFIG
+  ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.cfg.py)
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
+  MAIN_CONFIG
+  ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py)
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/API/lit.site.cfg.in
+  ${CMAKE_CURRENT_BINARY_DIR}/API/lit.site.cfg)
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
+  MAIN_CONFIG
+  ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.cfg.py)
+
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit-lldb-init.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Shell/lit-lldb-init)
+
+if(NOT LLDB_BUILT_STANDALONE)
+  add_lldb_test_dependency(
+    FileCheck
+    count
+    not
+  )
+endif()
 
-  # Use the same identity for testing
-  get_property(code_sign_identity_used GLOBAL PROPERTY LLDB_DEBUGSERVER_CODESIGN_IDENTITY)
-  if(code_sign_identity_used)
-    list(APPEND LLDB_TEST_COMMON_ARGS --codesign-identity "${code_sign_identity_used}")
-  endif()
 
-  if(LLDB_USE_SYSTEM_DEBUGSERVER)
-    lldb_find_system_debugserver(system_debugserver_path)
-    add_custom_target(debugserver
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      ${system_debugserver_path} ${LLVM_RUNTIME_OUTPUT_INTDIR}
-      COMMENT "Copying the system debugserver to LLDB's binaries directory for testing.")
-    # The custom target for the system debugserver has no install target, so we
-    # need to remove it from the LLVM_DISTRIBUTION_COMPONENTS list.
-    if (LLVM_DISTRIBUTION_COMPONENTS)
-      list(REMOVE_ITEM LLVM_DISTRIBUTION_COMPONENTS debugserver)
-      set(LLVM_DISTRIBUTION_COMPONENTS ${LLVM_DISTRIBUTION_COMPONENTS} PARENT_SCOPE)
-    endif()
-    message(STATUS "LLDB tests use out-of-tree debugserver: ${system_debugserver_path}")
-    list(APPEND LLDB_TEST_COMMON_ARGS --out-of-tree-debugserver)
-    add_lldb_test_dependency(debugserver)
-  elseif(TARGET debugserver)
-    set(debugserver_path ${LLVM_RUNTIME_OUTPUT_INTDIR}/debugserver)
-    message(STATUS "LLDB Tests use just-built debugserver: ${debugserver_path}")
-    list(APPEND LLDB_TEST_COMMON_ARGS --server ${debugserver_path})
-    add_lldb_test_dependency(debugserver)
-  elseif(TARGET lldb-server)
-    set(lldb_server_path ${LLVM_RUNTIME_OUTPUT_INTDIR}/lldb-server)
-    message(STATUS "LLDB Tests use just-built lldb-server: ${lldb_server_path}")
-    list(APPEND LLDB_TEST_COMMON_ARGS --server ${lldb_server_path})
-    add_lldb_test_dependency(lldb-server)
-  else()
-    message(WARNING "LLDB Tests enabled, but no server available")
-  endif()
-endif()
+add_lit_testsuites(LLDB
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  DEPENDS lldb-test-deps
+  )
 
-set(LLDB_DOTEST_ARGS ${LLDB_TEST_COMMON_ARGS};${LLDB_TEST_USER_ARGS})
-set_property(GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY ${LLDB_DOTEST_ARGS})
+add_lit_testsuite(check-lldb-lit "Running lldb lit test suite"
+  ${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS lldb-test-deps
+  )
+
+set_target_properties(check-lldb-lit PROPERTIES FOLDER "lldb tests")
 
 add_custom_target(check-lldb)
 add_dependencies(check-lldb lldb-test-deps)
 set_target_properties(check-lldb PROPERTIES FOLDER "lldb misc")
-
-# LLD is required to link test executables on Windows.
-if (CMAKE_SYSTEM_NAME MATCHES "Windows")
-  if (TARGET lld)
-    add_lldb_test_dependency(lld)
-  else ()
-    message(WARNING "lld required to test LLDB on Windows")
-  endif ()
-endif ()
-
-# Run the lit-style tests and the unittests as part of the check-lldb target.
 add_dependencies(check-lldb check-lldb-lit)
-
-# This will add LLDB's test dependencies to the dependencies for check-all and
-# include them in the test-depends target.
-set_property(GLOBAL APPEND PROPERTY LLVM_LIT_DEPENDS ${ARG_DEPENDS})
diff --git a/lldb/lit/Breakpoint/Inputs/case-sensitive.c b/lldb/test/Shell/Breakpoint/Inputs/case-sensitive.c
index 6df38dcacd7..6df38dcacd7 100644
--- a/lldb/lit/Breakpoint/Inputs/case-sensitive.c
+++ b/lldb/test/Shell/Breakpoint/Inputs/case-sensitive.c
diff --git a/lldb/lit/Breakpoint/Inputs/debug_addrx.yaml b/lldb/test/Shell/Breakpoint/Inputs/debug_addrx.yaml
index 7d4cd74543e..7d4cd74543e 100644
--- a/lldb/lit/Breakpoint/Inputs/debug_addrx.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/debug_addrx.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/debug_rnglist_basic.yaml b/lldb/test/Shell/Breakpoint/Inputs/debug_rnglist_basic.yaml
index 6a6db28790e..6a6db28790e 100644
--- a/lldb/lit/Breakpoint/Inputs/debug_rnglist_basic.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/debug_rnglist_basic.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/debug_rnglist_offset_pair.yaml b/lldb/test/Shell/Breakpoint/Inputs/debug_rnglist_offset_pair.yaml
index b919e3e4d1c..b919e3e4d1c 100644
--- a/lldb/lit/Breakpoint/Inputs/debug_rnglist_offset_pair.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/debug_rnglist_offset_pair.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/debug_rnglist_rlestartend.yaml b/lldb/test/Shell/Breakpoint/Inputs/debug_rnglist_rlestartend.yaml
index 79807773432..79807773432 100644
--- a/lldb/lit/Breakpoint/Inputs/debug_rnglist_rlestartend.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/debug_rnglist_rlestartend.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/debug_rnglistx_rlex.yaml b/lldb/test/Shell/Breakpoint/Inputs/debug_rnglistx_rlex.yaml
index 15b95e2a175..15b95e2a175 100644
--- a/lldb/lit/Breakpoint/Inputs/debug_rnglistx_rlex.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/debug_rnglistx_rlex.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/implicit_const_form_support.yaml b/lldb/test/Shell/Breakpoint/Inputs/implicit_const_form_support.yaml
index f1d8373923b..f1d8373923b 100644
--- a/lldb/lit/Breakpoint/Inputs/implicit_const_form_support.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/implicit_const_form_support.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/jitbp.cpp b/lldb/test/Shell/Breakpoint/Inputs/jitbp.cpp
index 447d9d66df8..447d9d66df8 100644
--- a/lldb/lit/Breakpoint/Inputs/jitbp.cpp
+++ b/lldb/test/Shell/Breakpoint/Inputs/jitbp.cpp
diff --git a/lldb/lit/Breakpoint/Inputs/ppc64-localentry.s b/lldb/test/Shell/Breakpoint/Inputs/ppc64-localentry.s
index 5fe0a97d06d..5fe0a97d06d 100644
--- a/lldb/lit/Breakpoint/Inputs/ppc64-localentry.s
+++ b/lldb/test/Shell/Breakpoint/Inputs/ppc64-localentry.s
diff --git a/lldb/lit/Breakpoint/Inputs/single-file-split-dwarf.o.yaml b/lldb/test/Shell/Breakpoint/Inputs/single-file-split-dwarf.o.yaml
index 5adc9d82fca..5adc9d82fca 100644
--- a/lldb/lit/Breakpoint/Inputs/single-file-split-dwarf.o.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/single-file-split-dwarf.o.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/single-file-split-dwarf.yaml b/lldb/test/Shell/Breakpoint/Inputs/single-file-split-dwarf.yaml
index da3e160a26e..da3e160a26e 100644
--- a/lldb/lit/Breakpoint/Inputs/single-file-split-dwarf.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/single-file-split-dwarf.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml
index 1e304e5fc46..1e304e5fc46 100644
--- a/lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.yaml b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf-5-addrbase.yaml
index 3a362b0d02d..3a362b0d02d 100644
--- a/lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf-5-addrbase.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml
index fbcb9a24921..fbcb9a24921 100644
--- a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml
index ef06915cddc..ef06915cddc 100644
--- a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml
diff --git a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-main.yaml b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-main.yaml
index ee998b4969f..ee998b4969f 100644
--- a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-main.yaml
+++ b/lldb/test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-main.yaml
diff --git a/lldb/lit/Breakpoint/case-insensitive.test b/lldb/test/Shell/Breakpoint/case-insensitive.test
index f6330b5f432..f6330b5f432 100644
--- a/lldb/lit/Breakpoint/case-insensitive.test
+++ b/lldb/test/Shell/Breakpoint/case-insensitive.test
diff --git a/lldb/lit/Breakpoint/case-sensitive.test b/lldb/test/Shell/Breakpoint/case-sensitive.test
index bab66282cde..bab66282cde 100644
--- a/lldb/lit/Breakpoint/case-sensitive.test
+++ b/lldb/test/Shell/Breakpoint/case-sensitive.test
diff --git a/lldb/lit/Breakpoint/debug_addrx.test b/lldb/test/Shell/Breakpoint/debug_addrx.test
index d5813cb9668..d5813cb9668 100644
--- a/lldb/lit/Breakpoint/debug_addrx.test
+++ b/lldb/test/Shell/Breakpoint/debug_addrx.test
diff --git a/lldb/lit/Breakpoint/debug_rnglist_basic.test b/lldb/test/Shell/Breakpoint/debug_rnglist_basic.test
index 268e4a0ed30..268e4a0ed30 100644
--- a/lldb/lit/Breakpoint/debug_rnglist_basic.test
+++ b/lldb/test/Shell/Breakpoint/debug_rnglist_basic.test
diff --git a/lldb/lit/Breakpoint/debug_rnglist_offset_pair.test b/lldb/test/Shell/Breakpoint/debug_rnglist_offset_pair.test
index 8edf3ee4f00..8edf3ee4f00 100644
--- a/lldb/lit/Breakpoint/debug_rnglist_offset_pair.test
+++ b/lldb/test/Shell/Breakpoint/debug_rnglist_offset_pair.test
diff --git a/lldb/lit/Breakpoint/debug_rnglist_rlestartend.test b/lldb/test/Shell/Breakpoint/debug_rnglist_rlestartend.test
index 9c8beb82c52..9c8beb82c52 100644
--- a/lldb/lit/Breakpoint/debug_rnglist_rlestartend.test
+++ b/lldb/test/Shell/Breakpoint/debug_rnglist_rlestartend.test
diff --git a/lldb/lit/Breakpoint/debug_rnglistx_rlex.test b/lldb/test/Shell/Breakpoint/debug_rnglistx_rlex.test
index 79a80479e72..79a80479e72 100644
--- a/lldb/lit/Breakpoint/debug_rnglistx_rlex.test
+++ b/lldb/test/Shell/Breakpoint/debug_rnglistx_rlex.test
diff --git a/lldb/lit/Breakpoint/implicit_const_form_support.test b/lldb/test/Shell/Breakpoint/implicit_const_form_support.test
index 183181d2f30..183181d2f30 100644
--- a/lldb/lit/Breakpoint/implicit_const_form_support.test
+++ b/lldb/test/Shell/Breakpoint/implicit_const_form_support.test
diff --git a/lldb/lit/Breakpoint/jitbp_elf.test b/lldb/test/Shell/Breakpoint/jitbp_elf.test
index 1dc5fa97005..1dc5fa97005 100644
--- a/lldb/lit/Breakpoint/jitbp_elf.test
+++ b/lldb/test/Shell/Breakpoint/jitbp_elf.test
diff --git a/lldb/lit/Breakpoint/ppc64-localentry.test b/lldb/test/Shell/Breakpoint/ppc64-localentry.test
index 16cce703045..16cce703045 100644
--- a/lldb/lit/Breakpoint/ppc64-localentry.test
+++ b/lldb/test/Shell/Breakpoint/ppc64-localentry.test
diff --git a/lldb/lit/Breakpoint/single-file-split-dwarf.test b/lldb/test/Shell/Breakpoint/single-file-split-dwarf.test
index d0cc003bf21..d0cc003bf21 100644
--- a/lldb/lit/Breakpoint/single-file-split-dwarf.test
+++ b/lldb/test/Shell/Breakpoint/single-file-split-dwarf.test
diff --git a/lldb/lit/Breakpoint/split-dwarf-5-addrbase.test b/lldb/test/Shell/Breakpoint/split-dwarf-5-addrbase.test
index 72a717d609d..72a717d609d 100644
--- a/lldb/lit/Breakpoint/split-dwarf-5-addrbase.test
+++ b/lldb/test/Shell/Breakpoint/split-dwarf-5-addrbase.test
diff --git a/lldb/lit/Breakpoint/split-dwarf5-debug-stroffsets.test b/lldb/test/Shell/Breakpoint/split-dwarf5-debug-stroffsets.test
index c1418ebb0d5..c1418ebb0d5 100644
--- a/lldb/lit/Breakpoint/split-dwarf5-debug-stroffsets.test
+++ b/lldb/test/Shell/Breakpoint/split-dwarf5-debug-stroffsets.test
diff --git a/lldb/lit/BuildScript/compiler-full-path.test b/lldb/test/Shell/BuildScript/compiler-full-path.test
index 592024e690e..592024e690e 100644
--- a/lldb/lit/BuildScript/compiler-full-path.test
+++ b/lldb/test/Shell/BuildScript/compiler-full-path.test
diff --git a/lldb/lit/BuildScript/modes.test b/lldb/test/Shell/BuildScript/modes.test
index 02311f712d7..02311f712d7 100644
--- a/lldb/lit/BuildScript/modes.test
+++ b/lldb/test/Shell/BuildScript/modes.test
diff --git a/lldb/lit/BuildScript/script-args.test b/lldb/test/Shell/BuildScript/script-args.test
index 13e8a516094..13e8a516094 100644
--- a/lldb/lit/BuildScript/script-args.test
+++ b/lldb/test/Shell/BuildScript/script-args.test
diff --git a/lldb/lit/BuildScript/toolchain-clang-cl.test b/lldb/test/Shell/BuildScript/toolchain-clang-cl.test
index cc219aca158..cc219aca158 100644
--- a/lldb/lit/BuildScript/toolchain-clang-cl.test
+++ b/lldb/test/Shell/BuildScript/toolchain-clang-cl.test
diff --git a/lldb/lit/BuildScript/toolchain-clang.test b/lldb/test/Shell/BuildScript/toolchain-clang.test
index eb2dbd54354..eb2dbd54354 100644
--- a/lldb/lit/BuildScript/toolchain-clang.test
+++ b/lldb/test/Shell/BuildScript/toolchain-clang.test
diff --git a/lldb/lit/BuildScript/toolchain-msvc.test b/lldb/test/Shell/BuildScript/toolchain-msvc.test
index 85a8f0d62f0..85a8f0d62f0 100644
--- a/lldb/lit/BuildScript/toolchain-msvc.test
+++ b/lldb/test/Shell/BuildScript/toolchain-msvc.test
diff --git a/lldb/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test
index c928a44afb7..c928a44afb7 100644
--- a/lldb/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test
+++ b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test
diff --git a/lldb/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test
index a653b74200d..a653b74200d 100644
--- a/lldb/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test
+++ b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test
diff --git a/lldb/lit/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
index 14add9943dc..14add9943dc 100644
--- a/lldb/lit/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
+++ b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
diff --git a/lldb/lit/Commands/CommandScriptImmediateOutput/lit.local.cfg b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/lit.local.cfg
index d880a5f420b..d880a5f420b 100644
--- a/lldb/lit/Commands/CommandScriptImmediateOutput/lit.local.cfg
+++ b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/lit.local.cfg
diff --git a/lldb/lit/Commands/Inputs/frame.py b/lldb/test/Shell/Commands/Inputs/frame.py
index 40591742839..40591742839 100644
--- a/lldb/lit/Commands/Inputs/frame.py
+++ b/lldb/test/Shell/Commands/Inputs/frame.py
diff --git a/lldb/lit/Commands/Inputs/main.c b/lldb/test/Shell/Commands/Inputs/main.c
index c029ddd96cd..c029ddd96cd 100644
--- a/lldb/lit/Commands/Inputs/main.c
+++ b/lldb/test/Shell/Commands/Inputs/main.c
diff --git a/lldb/lit/Commands/command-backtrace.test b/lldb/test/Shell/Commands/command-backtrace.test
index 2816f5f2e33..2816f5f2e33 100644
--- a/lldb/lit/Commands/command-backtrace.test
+++ b/lldb/test/Shell/Commands/command-backtrace.test
diff --git a/lldb/lit/Commands/command-regex-delete.test b/lldb/test/Shell/Commands/command-regex-delete.test
index ddc6259a9c9..ddc6259a9c9 100644
--- a/lldb/lit/Commands/command-regex-delete.test
+++ b/lldb/test/Shell/Commands/command-regex-delete.test
diff --git a/lldb/lit/Commands/command-regex-unalias.test b/lldb/test/Shell/Commands/command-regex-unalias.test
index 94f1a14ae00..94f1a14ae00 100644
--- a/lldb/lit/Commands/command-regex-unalias.test
+++ b/lldb/test/Shell/Commands/command-regex-unalias.test
diff --git a/lldb/lit/Commands/command-script-import.test b/lldb/test/Shell/Commands/command-script-import.test
index 18a043b4940..18a043b4940 100644
--- a/lldb/lit/Commands/command-script-import.test
+++ b/lldb/test/Shell/Commands/command-script-import.test
diff --git a/lldb/lit/Commands/command-source.test b/lldb/test/Shell/Commands/command-source.test
index d8218850c32..d8218850c32 100644
--- a/lldb/lit/Commands/command-source.test
+++ b/lldb/test/Shell/Commands/command-source.test
diff --git a/lldb/lit/Driver/Inputs/.lldbinit b/lldb/test/Shell/Driver/Inputs/.lldbinit
index 7628917d324..7628917d324 100644
--- a/lldb/lit/Driver/Inputs/.lldbinit
+++ b/lldb/test/Shell/Driver/Inputs/.lldbinit
diff --git a/lldb/lit/Driver/Inputs/Print0.in b/lldb/test/Shell/Driver/Inputs/Print0.in
index cb545cc15ab..cb545cc15ab 100644
--- a/lldb/lit/Driver/Inputs/Print0.in
+++ b/lldb/test/Shell/Driver/Inputs/Print0.in
diff --git a/lldb/lit/Driver/Inputs/Print2.in b/lldb/test/Shell/Driver/Inputs/Print2.in
index f51389a02a0..f51389a02a0 100644
--- a/lldb/lit/Driver/Inputs/Print2.in
+++ b/lldb/test/Shell/Driver/Inputs/Print2.in
diff --git a/lldb/lit/Driver/Inputs/Print4.in b/lldb/test/Shell/Driver/Inputs/Print4.in
index a2d49f30b99..a2d49f30b99 100644
--- a/lldb/lit/Driver/Inputs/Print4.in
+++ b/lldb/test/Shell/Driver/Inputs/Print4.in
diff --git a/lldb/lit/Driver/Inputs/Print6.in b/lldb/test/Shell/Driver/Inputs/Print6.in
index dee6212b87c..dee6212b87c 100644
--- a/lldb/lit/Driver/Inputs/Print6.in
+++ b/lldb/test/Shell/Driver/Inputs/Print6.in
diff --git a/lldb/lit/Driver/Inputs/convenience.in b/lldb/test/Shell/Driver/Inputs/convenience.in
index 6d5603c4351..6d5603c4351 100644
--- a/lldb/lit/Driver/Inputs/convenience.in
+++ b/lldb/test/Shell/Driver/Inputs/convenience.in
diff --git a/lldb/lit/Driver/Inputs/hello.c b/lldb/test/Shell/Driver/Inputs/hello.c
index 03b2213bb9a..03b2213bb9a 100644
--- a/lldb/lit/Driver/Inputs/hello.c
+++ b/lldb/test/Shell/Driver/Inputs/hello.c
diff --git a/lldb/lit/Driver/Inputs/hello.cpp b/lldb/test/Shell/Driver/Inputs/hello.cpp
index 1ec0677aeb2..1ec0677aeb2 100644
--- a/lldb/lit/Driver/Inputs/hello.cpp
+++ b/lldb/test/Shell/Driver/Inputs/hello.cpp
diff --git a/lldb/lit/Driver/Inputs/process_attach_pid.in b/lldb/test/Shell/Driver/Inputs/process_attach_pid.in
index 3d17ceee99e..3d17ceee99e 100644
--- a/lldb/lit/Driver/Inputs/process_attach_pid.in
+++ b/lldb/test/Shell/Driver/Inputs/process_attach_pid.in
diff --git a/lldb/lit/Driver/Inputs/syntax_error.py b/lldb/test/Shell/Driver/Inputs/syntax_error.py
index 587b8043dec..587b8043dec 100644
--- a/lldb/lit/Driver/Inputs/syntax_error.py
+++ b/lldb/test/Shell/Driver/Inputs/syntax_error.py
diff --git a/lldb/lit/Driver/LocalLLDBInit.test b/lldb/test/Shell/Driver/LocalLLDBInit.test
index 69b7781415a..69b7781415a 100644
--- a/lldb/lit/Driver/LocalLLDBInit.test
+++ b/lldb/test/Shell/Driver/LocalLLDBInit.test
diff --git a/lldb/lit/Driver/TestCommands.test b/lldb/test/Shell/Driver/TestCommands.test
index 3589abb8278..3589abb8278 100644
--- a/lldb/lit/Driver/TestCommands.test
+++ b/lldb/test/Shell/Driver/TestCommands.test
diff --git a/lldb/lit/Driver/TestConvenienceVariables.test b/lldb/test/Shell/Driver/TestConvenienceVariables.test
index a7b6faa34cb..a7b6faa34cb 100644
--- a/lldb/lit/Driver/TestConvenienceVariables.test
+++ b/lldb/test/Shell/Driver/TestConvenienceVariables.test
diff --git a/lldb/lit/Driver/TestCore.test b/lldb/test/Shell/Driver/TestCore.test
index cca8171da63..cca8171da63 100644
--- a/lldb/lit/Driver/TestCore.test
+++ b/lldb/test/Shell/Driver/TestCore.test
diff --git a/lldb/lit/Driver/TestFile.test b/lldb/test/Shell/Driver/TestFile.test
index 0e80594aeb1..0e80594aeb1 100644
--- a/lldb/lit/Driver/TestFile.test
+++ b/lldb/test/Shell/Driver/TestFile.test
diff --git a/lldb/lit/Driver/TestNoUseColor.test b/lldb/test/Shell/Driver/TestNoUseColor.test
index 62735301fca..62735301fca 100644
--- a/lldb/lit/Driver/TestNoUseColor.test
+++ b/lldb/test/Shell/Driver/TestNoUseColor.test
diff --git a/lldb/lit/Driver/TestProcessAttach.test b/lldb/test/Shell/Driver/TestProcessAttach.test
index 4e24ebb161b..4e24ebb161b 100644
--- a/lldb/lit/Driver/TestProcessAttach.test
+++ b/lldb/test/Shell/Driver/TestProcessAttach.test
diff --git a/lldb/lit/Driver/TestRepl.test b/lldb/test/Shell/Driver/TestRepl.test
index 083863985a1..083863985a1 100644
--- a/lldb/lit/Driver/TestRepl.test
+++ b/lldb/test/Shell/Driver/TestRepl.test
diff --git a/lldb/lit/Driver/TestSingleQuote.test b/lldb/test/Shell/Driver/TestSingleQuote.test
index 0ba4a1456fa..0ba4a1456fa 100644
--- a/lldb/lit/Driver/TestSingleQuote.test
+++ b/lldb/test/Shell/Driver/TestSingleQuote.test
diff --git a/lldb/lit/Driver/TestTarget.test b/lldb/test/Shell/Driver/TestTarget.test
index fcf7f776bbc..fcf7f776bbc 100644
--- a/lldb/lit/Driver/TestTarget.test
+++ b/lldb/test/Shell/Driver/TestTarget.test
diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit
index 4ab5d56f036..4ab5d56f036 100644
--- a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit
diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
index 31817bdaaa5..31817bdaaa5 100644
--- a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
index 36e144deecc..36e144deecc 100644
--- a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit
index 004bd34abfb..004bd34abfb 100644
--- a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit
diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit
index 3b7d23953c3..3b7d23953c3 100644
--- a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit
diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads.cpp b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
index 46aae8346be..46aae8346be 100644
--- a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook.c b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook.c
index e1b2579526d..e1b2579526d 100644
--- a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook.c
+++ b/lldb/test/Shell/ExecControl/StopHook/Inputs/stop-hook.c
diff --git a/lldb/lit/ExecControl/StopHook/stop-hook-threads.test b/lldb/test/Shell/ExecControl/StopHook/stop-hook-threads.test
index edb95ffc25e..edb95ffc25e 100644
--- a/lldb/lit/ExecControl/StopHook/stop-hook-threads.test
+++ b/lldb/test/Shell/ExecControl/StopHook/stop-hook-threads.test
diff --git a/lldb/lit/ExecControl/StopHook/stop-hook.test b/lldb/test/Shell/ExecControl/StopHook/stop-hook.test
index ca6495ef14a..ca6495ef14a 100644
--- a/lldb/lit/ExecControl/StopHook/stop-hook.test
+++ b/lldb/test/Shell/ExecControl/StopHook/stop-hook.test
diff --git a/lldb/lit/Expr/Inputs/call-function.cpp b/lldb/test/Shell/Expr/Inputs/call-function.cpp
index cc5f52dbf56..cc5f52dbf56 100644
--- a/lldb/lit/Expr/Inputs/call-function.cpp
+++ b/lldb/test/Shell/Expr/Inputs/call-function.cpp
diff --git a/lldb/lit/Expr/Inputs/ir-memory-map-basic b/lldb/test/Shell/Expr/Inputs/ir-memory-map-basic
index c48392594ca..c48392594ca 100644
--- a/lldb/lit/Expr/Inputs/ir-memory-map-basic
+++ b/lldb/test/Shell/Expr/Inputs/ir-memory-map-basic
diff --git a/lldb/lit/Expr/Inputs/ir-memory-map-mix-malloc-free b/lldb/test/Shell/Expr/Inputs/ir-memory-map-mix-malloc-free
index 3b57cc8bdf4..3b57cc8bdf4 100644
--- a/lldb/lit/Expr/Inputs/ir-memory-map-mix-malloc-free
+++ b/lldb/test/Shell/Expr/Inputs/ir-memory-map-mix-malloc-free
diff --git a/lldb/lit/Expr/Inputs/ir-memory-map-overlap1 b/lldb/test/Shell/Expr/Inputs/ir-memory-map-overlap1
index 6e842671fba..6e842671fba 100644
--- a/lldb/lit/Expr/Inputs/ir-memory-map-overlap1
+++ b/lldb/test/Shell/Expr/Inputs/ir-memory-map-overlap1
diff --git a/lldb/lit/Expr/TestIRMemoryMap.test b/lldb/test/Shell/Expr/TestIRMemoryMap.test
index a8f835b1676..a8f835b1676 100644
--- a/lldb/lit/Expr/TestIRMemoryMap.test
+++ b/lldb/test/Shell/Expr/TestIRMemoryMap.test
diff --git a/lldb/lit/Expr/TestIRMemoryMapWindows.test b/lldb/test/Shell/Expr/TestIRMemoryMapWindows.test
index f25db591fa5..f25db591fa5 100644
--- a/lldb/lit/Expr/TestIRMemoryMapWindows.test
+++ b/lldb/test/Shell/Expr/TestIRMemoryMapWindows.test
diff --git a/lldb/lit/Expr/TestMultilineExpr.test b/lldb/test/Shell/Expr/TestMultilineExpr.test
index ae02407b576..ae02407b576 100644
--- a/lldb/lit/Expr/TestMultilineExpr.test
+++ b/lldb/test/Shell/Expr/TestMultilineExpr.test
diff --git a/lldb/lit/Expr/TestTypeOfDeclTypeExpr.test b/lldb/test/Shell/Expr/TestTypeOfDeclTypeExpr.test
index c156ae556a7..c156ae556a7 100644
--- a/lldb/lit/Expr/TestTypeOfDeclTypeExpr.test
+++ b/lldb/test/Shell/Expr/TestTypeOfDeclTypeExpr.test
diff --git a/lldb/lit/Heap/Inputs/cstr.c b/lldb/test/Shell/Heap/Inputs/cstr.c
index 2f9117b635e..2f9117b635e 100644
--- a/lldb/lit/Heap/Inputs/cstr.c
+++ b/lldb/test/Shell/Heap/Inputs/cstr.c
diff --git a/lldb/lit/Heap/heap-cstr.test b/lldb/test/Shell/Heap/heap-cstr.test
index 00d19ffbe47..00d19ffbe47 100644
--- a/lldb/lit/Heap/heap-cstr.test
+++ b/lldb/test/Shell/Heap/heap-cstr.test
diff --git a/lldb/lit/Host/Inputs/simple.c b/lldb/test/Shell/Host/Inputs/simple.c
index 06e216a2fde..06e216a2fde 100644
--- a/lldb/lit/Host/Inputs/simple.c
+++ b/lldb/test/Shell/Host/Inputs/simple.c
diff --git a/lldb/lit/Host/TestCustomShell.test b/lldb/test/Shell/Host/TestCustomShell.test
index 97511eb7948..97511eb7948 100644
--- a/lldb/lit/Host/TestCustomShell.test
+++ b/lldb/test/Shell/Host/TestCustomShell.test
diff --git a/lldb/lit/Minidump/Inputs/linux-x86_64.syms b/lldb/test/Shell/Minidump/Inputs/linux-x86_64.syms
index dd3c60b72c2..dd3c60b72c2 100644
--- a/lldb/lit/Minidump/Inputs/linux-x86_64.syms
+++ b/lldb/test/Shell/Minidump/Inputs/linux-x86_64.syms
diff --git a/lldb/lit/Minidump/Inputs/linux-x86_64.yaml b/lldb/test/Shell/Minidump/Inputs/linux-x86_64.yaml
index d2ae6543141..d2ae6543141 100644
--- a/lldb/lit/Minidump/Inputs/linux-x86_64.yaml
+++ b/lldb/test/Shell/Minidump/Inputs/linux-x86_64.yaml
diff --git a/lldb/lit/Minidump/Windows/Inputs/find-module.dmp.yaml b/lldb/test/Shell/Minidump/Windows/Inputs/find-module.dmp.yaml
index aef94e34a94..aef94e34a94 100644
--- a/lldb/lit/Minidump/Windows/Inputs/find-module.dmp.yaml
+++ b/lldb/test/Shell/Minidump/Windows/Inputs/find-module.dmp.yaml
diff --git a/lldb/lit/Minidump/Windows/Inputs/find-module.exe.yaml b/lldb/test/Shell/Minidump/Windows/Inputs/find-module.exe.yaml
index 42ccc6d6e05..42ccc6d6e05 100644
--- a/lldb/lit/Minidump/Windows/Inputs/find-module.exe.yaml
+++ b/lldb/test/Shell/Minidump/Windows/Inputs/find-module.exe.yaml
diff --git a/lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.cpp b/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.cpp
index 6bf78b5dc43..6bf78b5dc43 100644
--- a/lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.cpp
+++ b/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.cpp
diff --git a/lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp b/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp
index c918a6c64e5..c918a6c64e5 100644
--- a/lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp
+++ b/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp
diff --git a/lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.lldbinit b/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.lldbinit
index dff1f1a295e..dff1f1a295e 100644
--- a/lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.lldbinit
+++ b/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.lldbinit
diff --git a/lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb b/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb
index d60f9cffdda..d60f9cffdda 100644
--- a/lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb
+++ b/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb
diff --git a/lldb/lit/Minidump/Windows/Sigsegv/sigsegv.test b/lldb/test/Shell/Minidump/Windows/Sigsegv/sigsegv.test
index dfa98c56656..dfa98c56656 100644
--- a/lldb/lit/Minidump/Windows/Sigsegv/sigsegv.test
+++ b/lldb/test/Shell/Minidump/Windows/Sigsegv/sigsegv.test
diff --git a/lldb/lit/Minidump/Windows/find-module.test b/lldb/test/Shell/Minidump/Windows/find-module.test
index 170a1803c67..170a1803c67 100644
--- a/lldb/lit/Minidump/Windows/find-module.test
+++ b/lldb/test/Shell/Minidump/Windows/find-module.test
diff --git a/lldb/lit/Minidump/breakpad-symbols.test b/lldb/test/Shell/Minidump/breakpad-symbols.test
index 4b3ae94c3dc..4b3ae94c3dc 100644
--- a/lldb/lit/Minidump/breakpad-symbols.test
+++ b/lldb/test/Shell/Minidump/breakpad-symbols.test
diff --git a/lldb/lit/Minidump/disassemble-no-module.yaml b/lldb/test/Shell/Minidump/disassemble-no-module.yaml
index 14637d5b7c6..14637d5b7c6 100644
--- a/lldb/lit/Minidump/disassemble-no-module.yaml
+++ b/lldb/test/Shell/Minidump/disassemble-no-module.yaml
diff --git a/lldb/lit/Minidump/dump-all.test b/lldb/test/Shell/Minidump/dump-all.test
index 92f2be24e17..92f2be24e17 100644
--- a/lldb/lit/Minidump/dump-all.test
+++ b/lldb/test/Shell/Minidump/dump-all.test
diff --git a/lldb/lit/Minidump/fb-dump.test b/lldb/test/Shell/Minidump/fb-dump.test
index 1cd777c6d71..1cd777c6d71 100644
--- a/lldb/lit/Minidump/fb-dump.test
+++ b/lldb/test/Shell/Minidump/fb-dump.test
diff --git a/lldb/lit/Minidump/lit.local.cfg b/lldb/test/Shell/Minidump/lit.local.cfg
index db82cc23100..db82cc23100 100644
--- a/lldb/lit/Minidump/lit.local.cfg
+++ b/lldb/test/Shell/Minidump/lit.local.cfg
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms
index 0241d512862..0241d512862 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms
index 4ae10438f30..4ae10438f30 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms
index 2e6d72a37d5..2e6d72a37d5 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms
index 40c94574215..40c94574215 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/identification-linux.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/identification-linux.syms
index d82e30c4a05..d82e30c4a05 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/identification-linux.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/identification-linux.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms
index 18090d7a0d5..18090d7a0d5 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/identification-macosx.syms
index 56e0635e5f6..56e0635e5f6 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/identification-macosx.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/identification-windows.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/identification-windows.syms
index 8fa5f305209..8fa5f305209 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/identification-windows.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/identification-windows.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms
index 6176d35143c..6176d35143c 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/sections.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/sections.syms
index 121cca439b0..121cca439b0 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/sections.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/sections.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms
index 7da9264de98..7da9264de98 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms
diff --git a/lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml
index 9e1af9c6e90..9e1af9c6e90 100644
--- a/lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml
+++ b/lldb/test/Shell/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml
diff --git a/lldb/lit/ObjectFile/Breakpad/breakpad-identification.test b/lldb/test/Shell/ObjectFile/Breakpad/breakpad-identification.test
index 312eb148023..312eb148023 100644
--- a/lldb/lit/ObjectFile/Breakpad/breakpad-identification.test
+++ b/lldb/test/Shell/ObjectFile/Breakpad/breakpad-identification.test
diff --git a/lldb/lit/ObjectFile/Breakpad/discontiguous-sections.test b/lldb/test/Shell/ObjectFile/Breakpad/discontiguous-sections.test
index 6b765e0c40e..6b765e0c40e 100644
--- a/lldb/lit/ObjectFile/Breakpad/discontiguous-sections.test
+++ b/lldb/test/Shell/ObjectFile/Breakpad/discontiguous-sections.test
diff --git a/lldb/lit/ObjectFile/Breakpad/lit.local.cfg b/lldb/test/Shell/ObjectFile/Breakpad/lit.local.cfg
index df9b335dd13..df9b335dd13 100644
--- a/lldb/lit/ObjectFile/Breakpad/lit.local.cfg
+++ b/lldb/test/Shell/ObjectFile/Breakpad/lit.local.cfg
diff --git a/lldb/lit/ObjectFile/Breakpad/sections-trailing-func.test b/lldb/test/Shell/ObjectFile/Breakpad/sections-trailing-func.test
index 9ea5c9da781..9ea5c9da781 100644
--- a/lldb/lit/ObjectFile/Breakpad/sections-trailing-func.test
+++ b/lldb/test/Shell/ObjectFile/Breakpad/sections-trailing-func.test
diff --git a/lldb/lit/ObjectFile/Breakpad/sections.test b/lldb/test/Shell/ObjectFile/Breakpad/sections.test
index 90f3d92643a..90f3d92643a 100644
--- a/lldb/lit/ObjectFile/Breakpad/sections.test
+++ b/lldb/test/Shell/ObjectFile/Breakpad/sections.test
diff --git a/lldb/lit/ObjectFile/Breakpad/uuid-matching-mac.test b/lldb/test/Shell/ObjectFile/Breakpad/uuid-matching-mac.test
index f2dd2e56312..f2dd2e56312 100644
--- a/lldb/lit/ObjectFile/Breakpad/uuid-matching-mac.test
+++ b/lldb/test/Shell/ObjectFile/Breakpad/uuid-matching-mac.test
diff --git a/lldb/lit/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf b/lldb/test/Shell/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf
index d5fd2d1fa91..d5fd2d1fa91 100644
--- a/lldb/lit/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf
+++ b/lldb/test/Shell/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf
diff --git a/lldb/lit/ObjectFile/ELF/Inputs/minidebuginfo-main.c b/lldb/test/Shell/ObjectFile/ELF/Inputs/minidebuginfo-main.c
index 8f11dafece6..8f11dafece6 100644
--- a/lldb/lit/ObjectFile/ELF/Inputs/minidebuginfo-main.c
+++ b/lldb/test/Shell/ObjectFile/ELF/Inputs/minidebuginfo-main.c
diff --git a/lldb/lit/ObjectFile/ELF/Inputs/netbsd-amd64.core b/lldb/test/Shell/ObjectFile/ELF/Inputs/netbsd-amd64.core
index bf647fdd792..bf647fdd792 100644
--- a/lldb/lit/ObjectFile/ELF/Inputs/netbsd-amd64.core
+++ b/lldb/test/Shell/ObjectFile/ELF/Inputs/netbsd-amd64.core
diff --git a/lldb/lit/ObjectFile/ELF/PT_LOAD-empty.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-empty.yaml
index 9f1cb074572..9f1cb074572 100644
--- a/lldb/lit/ObjectFile/ELF/PT_LOAD-empty.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-empty.yaml
diff --git a/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
index e97afe9070c..e97afe9070c 100644
--- a/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
diff --git a/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
index d6844666804..d6844666804 100644
--- a/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
diff --git a/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-section.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
index 3b7bde802ce..3b7bde802ce 100644
--- a/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
diff --git a/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap.yaml
index 1315f54e6c0..1315f54e6c0 100644
--- a/lldb/lit/ObjectFile/ELF/PT_LOAD-overlap.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap.yaml
diff --git a/lldb/lit/ObjectFile/ELF/PT_LOAD.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD.yaml
index d673a69c8cd..d673a69c8cd 100644
--- a/lldb/lit/ObjectFile/ELF/PT_LOAD.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD.yaml
diff --git a/lldb/lit/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
index cd3939e0541..cd3939e0541 100644
--- a/lldb/lit/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
diff --git a/lldb/lit/ObjectFile/ELF/aarch64-relocations.yaml b/lldb/test/Shell/ObjectFile/ELF/aarch64-relocations.yaml
index b9433a0ef5a..b9433a0ef5a 100644
--- a/lldb/lit/ObjectFile/ELF/aarch64-relocations.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/aarch64-relocations.yaml
diff --git a/lldb/lit/ObjectFile/ELF/base-address.yaml b/lldb/test/Shell/ObjectFile/ELF/base-address.yaml
index 68f11770835..68f11770835 100644
--- a/lldb/lit/ObjectFile/ELF/base-address.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/base-address.yaml
diff --git a/lldb/lit/ObjectFile/ELF/basic-info.yaml b/lldb/test/Shell/ObjectFile/ELF/basic-info.yaml
index 0e1db67e9d5..0e1db67e9d5 100644
--- a/lldb/lit/ObjectFile/ELF/basic-info.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/basic-info.yaml
diff --git a/lldb/lit/ObjectFile/ELF/build-id-case.yaml b/lldb/test/Shell/ObjectFile/ELF/build-id-case.yaml
index f9786b3754f..f9786b3754f 100644
--- a/lldb/lit/ObjectFile/ELF/build-id-case.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/build-id-case.yaml
diff --git a/lldb/lit/ObjectFile/ELF/compressed-sections.yaml b/lldb/test/Shell/ObjectFile/ELF/compressed-sections.yaml
index f8c31d52bb8..f8c31d52bb8 100644
--- a/lldb/lit/ObjectFile/ELF/compressed-sections.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/compressed-sections.yaml
diff --git a/lldb/lit/ObjectFile/ELF/duplicate-section.yaml b/lldb/test/Shell/ObjectFile/ELF/duplicate-section.yaml
index 8b280d2449b..8b280d2449b 100644
--- a/lldb/lit/ObjectFile/ELF/duplicate-section.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/duplicate-section.yaml
diff --git a/lldb/lit/ObjectFile/ELF/gnu-debuglink.yaml b/lldb/test/Shell/ObjectFile/ELF/gnu-debuglink.yaml
index b39b3187ae9..b39b3187ae9 100644
--- a/lldb/lit/ObjectFile/ELF/gnu-debuglink.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/gnu-debuglink.yaml
diff --git a/lldb/lit/ObjectFile/ELF/many-sections.s b/lldb/test/Shell/ObjectFile/ELF/many-sections.s
index 15d7e8fc158..15d7e8fc158 100644
--- a/lldb/lit/ObjectFile/ELF/many-sections.s
+++ b/lldb/test/Shell/ObjectFile/ELF/many-sections.s
diff --git a/lldb/lit/ObjectFile/ELF/minidebuginfo-corrupt-xz.yaml b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-corrupt-xz.yaml
index cec34b9c623..cec34b9c623 100644
--- a/lldb/lit/ObjectFile/ELF/minidebuginfo-corrupt-xz.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-corrupt-xz.yaml
diff --git a/lldb/lit/ObjectFile/ELF/minidebuginfo-find-symbols.yaml b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-find-symbols.yaml
index 230ce8bb1c3..230ce8bb1c3 100644
--- a/lldb/lit/ObjectFile/ELF/minidebuginfo-find-symbols.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-find-symbols.yaml
diff --git a/lldb/lit/ObjectFile/ELF/minidebuginfo-no-lzma.yaml b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-no-lzma.yaml
index a127109e991..a127109e991 100644
--- a/lldb/lit/ObjectFile/ELF/minidebuginfo-no-lzma.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-no-lzma.yaml
diff --git a/lldb/lit/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test
index c568a19642a..c568a19642a 100644
--- a/lldb/lit/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test
+++ b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test
diff --git a/lldb/lit/ObjectFile/ELF/netbsd-core-amd64.test b/lldb/test/Shell/ObjectFile/ELF/netbsd-core-amd64.test
index 7140b4f8998..7140b4f8998 100644
--- a/lldb/lit/ObjectFile/ELF/netbsd-core-amd64.test
+++ b/lldb/test/Shell/ObjectFile/ELF/netbsd-core-amd64.test
diff --git a/lldb/lit/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml b/lldb/test/Shell/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml
index d8e68e9085a..d8e68e9085a 100644
--- a/lldb/lit/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml
diff --git a/lldb/lit/ObjectFile/ELF/section-addresses.yaml b/lldb/test/Shell/ObjectFile/ELF/section-addresses.yaml
index 012abbf1f6d..012abbf1f6d 100644
--- a/lldb/lit/ObjectFile/ELF/section-addresses.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/section-addresses.yaml
diff --git a/lldb/lit/ObjectFile/ELF/section-overlap.yaml b/lldb/test/Shell/ObjectFile/ELF/section-overlap.yaml
index bfbd873be41..bfbd873be41 100644
--- a/lldb/lit/ObjectFile/ELF/section-overlap.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/section-overlap.yaml
diff --git a/lldb/lit/ObjectFile/ELF/section-permissions.yaml b/lldb/test/Shell/ObjectFile/ELF/section-permissions.yaml
index 99c2773c81b..99c2773c81b 100644
--- a/lldb/lit/ObjectFile/ELF/section-permissions.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/section-permissions.yaml
diff --git a/lldb/lit/ObjectFile/ELF/section-types-edgecases.yaml b/lldb/test/Shell/ObjectFile/ELF/section-types-edgecases.yaml
index ad1fa2d9097..ad1fa2d9097 100644
--- a/lldb/lit/ObjectFile/ELF/section-types-edgecases.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/section-types-edgecases.yaml
diff --git a/lldb/lit/ObjectFile/ELF/section-types.yaml b/lldb/test/Shell/ObjectFile/ELF/section-types.yaml
index 9f6b4c0533b..9f6b4c0533b 100644
--- a/lldb/lit/ObjectFile/ELF/section-types.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/section-types.yaml
diff --git a/lldb/lit/ObjectFile/ELF/short-build-id.yaml b/lldb/test/Shell/ObjectFile/ELF/short-build-id.yaml
index 90781347392..90781347392 100644
--- a/lldb/lit/ObjectFile/ELF/short-build-id.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/short-build-id.yaml
diff --git a/lldb/lit/ObjectFile/MachO/lc_build_version.yaml b/lldb/test/Shell/ObjectFile/MachO/lc_build_version.yaml
index 763525c6e5b..763525c6e5b 100644
--- a/lldb/lit/ObjectFile/MachO/lc_build_version.yaml
+++ b/lldb/test/Shell/ObjectFile/MachO/lc_build_version.yaml
diff --git a/lldb/lit/ObjectFile/MachO/lc_build_version_notools.yaml b/lldb/test/Shell/ObjectFile/MachO/lc_build_version_notools.yaml
index f84c71aff6a..f84c71aff6a 100644
--- a/lldb/lit/ObjectFile/MachO/lc_build_version_notools.yaml
+++ b/lldb/test/Shell/ObjectFile/MachO/lc_build_version_notools.yaml
diff --git a/lldb/lit/ObjectFile/MachO/lc_version_min.yaml b/lldb/test/Shell/ObjectFile/MachO/lc_version_min.yaml
index e79107069f3..e79107069f3 100644
--- a/lldb/lit/ObjectFile/MachO/lc_version_min.yaml
+++ b/lldb/test/Shell/ObjectFile/MachO/lc_version_min.yaml
diff --git a/lldb/lit/ObjectFile/MachO/subsections.yaml b/lldb/test/Shell/ObjectFile/MachO/subsections.yaml
index a92ef41d79f..a92ef41d79f 100644
--- a/lldb/lit/ObjectFile/MachO/subsections.yaml
+++ b/lldb/test/Shell/ObjectFile/MachO/subsections.yaml
diff --git a/lldb/lit/ObjectFile/MachO/symtab.yaml b/lldb/test/Shell/ObjectFile/MachO/symtab.yaml
index e50ba6b6c22..e50ba6b6c22 100644
--- a/lldb/lit/ObjectFile/MachO/symtab.yaml
+++ b/lldb/test/Shell/ObjectFile/MachO/symtab.yaml
diff --git a/lldb/lit/ObjectFile/PECOFF/basic-info-arm.yaml b/lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm.yaml
index 39ef9476857..39ef9476857 100644
--- a/lldb/lit/ObjectFile/PECOFF/basic-info-arm.yaml
+++ b/lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm.yaml
diff --git a/lldb/lit/ObjectFile/PECOFF/basic-info-arm64.yaml b/lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml
index 1fcf3b35a8d..1fcf3b35a8d 100644
--- a/lldb/lit/ObjectFile/PECOFF/basic-info-arm64.yaml
+++ b/lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml
diff --git a/lldb/lit/ObjectFile/PECOFF/basic-info.yaml b/lldb/test/Shell/ObjectFile/PECOFF/basic-info.yaml
index 6b08788fb75..6b08788fb75 100644
--- a/lldb/lit/ObjectFile/PECOFF/basic-info.yaml
+++ b/lldb/test/Shell/ObjectFile/PECOFF/basic-info.yaml
diff --git a/lldb/lit/ObjectFile/PECOFF/dep-modules.yaml b/lldb/test/Shell/ObjectFile/PECOFF/dep-modules.yaml
index 12249439d8f..12249439d8f 100644
--- a/lldb/lit/ObjectFile/PECOFF/dep-modules.yaml
+++ b/lldb/test/Shell/ObjectFile/PECOFF/dep-modules.yaml
diff --git a/lldb/lit/ObjectFile/PECOFF/export-dllfunc.yaml b/lldb/test/Shell/ObjectFile/PECOFF/export-dllfunc.yaml
index 1f858d735ec..1f858d735ec 100644
--- a/lldb/lit/ObjectFile/PECOFF/export-dllfunc.yaml
+++ b/lldb/test/Shell/ObjectFile/PECOFF/export-dllfunc.yaml
diff --git a/lldb/lit/ObjectFile/PECOFF/lit.local.cfg b/lldb/test/Shell/ObjectFile/PECOFF/lit.local.cfg
index 9ef350be1de..9ef350be1de 100644
--- a/lldb/lit/ObjectFile/PECOFF/lit.local.cfg
+++ b/lldb/test/Shell/ObjectFile/PECOFF/lit.local.cfg
diff --git a/lldb/lit/ObjectFile/PECOFF/sections-names.yaml b/lldb/test/Shell/ObjectFile/PECOFF/sections-names.yaml
index b62c0bc0426..b62c0bc0426 100644
--- a/lldb/lit/ObjectFile/PECOFF/sections-names.yaml
+++ b/lldb/test/Shell/ObjectFile/PECOFF/sections-names.yaml
diff --git a/lldb/lit/ObjectFile/PECOFF/subsections.yaml b/lldb/test/Shell/ObjectFile/PECOFF/subsections.yaml
index d7ecf68e84a..d7ecf68e84a 100644
--- a/lldb/lit/ObjectFile/PECOFF/subsections.yaml
+++ b/lldb/test/Shell/ObjectFile/PECOFF/subsections.yaml
diff --git a/lldb/lit/ObjectFile/PECOFF/uuid.yaml b/lldb/test/Shell/ObjectFile/PECOFF/uuid.yaml
index 4f371089167..4f371089167 100644
--- a/lldb/lit/ObjectFile/PECOFF/uuid.yaml
+++ b/lldb/test/Shell/ObjectFile/PECOFF/uuid.yaml
diff --git a/lldb/lit/ObjectFile/lit.local.cfg b/lldb/test/Shell/ObjectFile/lit.local.cfg
index 60e87e4624e..60e87e4624e 100644
--- a/lldb/lit/ObjectFile/lit.local.cfg
+++ b/lldb/test/Shell/ObjectFile/lit.local.cfg
diff --git a/lldb/lit/Process/Inputs/env.cpp b/lldb/test/Shell/Process/Inputs/env.cpp
index cbf671ccd2f..cbf671ccd2f 100644
--- a/lldb/lit/Process/Inputs/env.cpp
+++ b/lldb/test/Shell/Process/Inputs/env.cpp
diff --git a/lldb/lit/Process/TestEnvironment.test b/lldb/test/Shell/Process/TestEnvironment.test
index 355feb306cd..355feb306cd 100644
--- a/lldb/lit/Process/TestEnvironment.test
+++ b/lldb/test/Shell/Process/TestEnvironment.test
diff --git a/lldb/lit/Process/Windows/exception_access_violation.cpp b/lldb/test/Shell/Process/Windows/exception_access_violation.cpp
index 4835b498ee4..4835b498ee4 100644
--- a/lldb/lit/Process/Windows/exception_access_violation.cpp
+++ b/lldb/test/Shell/Process/Windows/exception_access_violation.cpp
diff --git a/lldb/lit/Python/crashlog.test b/lldb/test/Shell/Python/crashlog.test
index 7ea7c0b5d74..24d72eae41f 100644
--- a/lldb/lit/Python/crashlog.test
+++ b/lldb/test/Shell/Python/crashlog.test
@@ -1,6 +1,6 @@
 #                                                                 -*- python -*-
 # REQUIRES: system-darwin
-# RUN: cd %S/../../examples/python && cat %s | %lldb | FileCheck %s
+# RUN: cd %S/../../../examples/python && cat %s | %lldb | FileCheck %s
 # CHECK-LABEL: {{S}}KIP BEYOND CHECKS
 script
 import crashlog
@@ -44,7 +44,7 @@ images = [
 # CHECK: (0)
 # CHECK: 01234
 # CHECK: /tmp/MyApp Pro.app/MyApp Pro
-    
+
 "0x7fff63f20000 - 0x7fff63f77ff7  libc++.1.dylib (400.9.4) /usr/lib/libc++.1.dylib"
 # CHECK: 0x7fff63f20000
 # CHECK: 0x7fff63f77ff7
diff --git a/lldb/lit/Quit/TestQuitExitCode-30.test b/lldb/test/Shell/Quit/TestQuitExitCode-30.test
index 2f15398c761..2f15398c761 100644
--- a/lldb/lit/Quit/TestQuitExitCode-30.test
+++ b/lldb/test/Shell/Quit/TestQuitExitCode-30.test
diff --git a/lldb/lit/Quit/TestQuitExitCode0.test b/lldb/test/Shell/Quit/TestQuitExitCode0.test
index af39b4293f3..af39b4293f3 100644
--- a/lldb/lit/Quit/TestQuitExitCode0.test
+++ b/lldb/test/Shell/Quit/TestQuitExitCode0.test
diff --git a/lldb/lit/Quit/TestQuitExitCode30.test b/lldb/test/Shell/Quit/TestQuitExitCode30.test
index e5ff634e713..e5ff634e713 100644
--- a/lldb/lit/Quit/TestQuitExitCode30.test
+++ b/lldb/test/Shell/Quit/TestQuitExitCode30.test
diff --git a/lldb/lit/Quit/TestQuitExitCodeHex0.test b/lldb/test/Shell/Quit/TestQuitExitCodeHex0.test
index f85a046fa13..f85a046fa13 100644
--- a/lldb/lit/Quit/TestQuitExitCodeHex0.test
+++ b/lldb/test/Shell/Quit/TestQuitExitCodeHex0.test
diff --git a/lldb/lit/Quit/TestQuitExitCodeHexA.test b/lldb/test/Shell/Quit/TestQuitExitCodeHexA.test
index ca0e2d5acc3..ca0e2d5acc3 100644
--- a/lldb/lit/Quit/TestQuitExitCodeHexA.test
+++ b/lldb/test/Shell/Quit/TestQuitExitCodeHexA.test
diff --git a/lldb/lit/Quit/TestQuitExitCodeImplicit0.test b/lldb/test/Shell/Quit/TestQuitExitCodeImplicit0.test
index 5494231b23b..5494231b23b 100644
--- a/lldb/lit/Quit/TestQuitExitCodeImplicit0.test
+++ b/lldb/test/Shell/Quit/TestQuitExitCodeImplicit0.test
diff --git a/lldb/lit/Quit/TestQuitExitCodeNonInt.test b/lldb/test/Shell/Quit/TestQuitExitCodeNonInt.test
index 87c0bd41bb0..87c0bd41bb0 100644
--- a/lldb/lit/Quit/TestQuitExitCodeNonInt.test
+++ b/lldb/test/Shell/Quit/TestQuitExitCodeNonInt.test
diff --git a/lldb/lit/Quit/TestQuitExitCodeTooManyArgs.test b/lldb/test/Shell/Quit/TestQuitExitCodeTooManyArgs.test
index a67669451e9..a67669451e9 100644
--- a/lldb/lit/Quit/TestQuitExitCodeTooManyArgs.test
+++ b/lldb/test/Shell/Quit/TestQuitExitCodeTooManyArgs.test
diff --git a/lldb/lit/Quit/expect_exit_code.py b/lldb/test/Shell/Quit/expect_exit_code.py
index 32b2e29d53d..32b2e29d53d 100755
--- a/lldb/lit/Quit/expect_exit_code.py
+++ b/lldb/test/Shell/Quit/expect_exit_code.py
diff --git a/lldb/lit/Register/Inputs/x86-64-gp-read.cpp b/lldb/test/Shell/Register/Inputs/x86-64-gp-read.cpp
index 857b9e09949..857b9e09949 100644
--- a/lldb/lit/Register/Inputs/x86-64-gp-read.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-64-gp-read.cpp
diff --git a/lldb/lit/Register/Inputs/x86-64-gp-write.cpp b/lldb/test/Shell/Register/Inputs/x86-64-gp-write.cpp
index fd579c031a3..fd579c031a3 100644
--- a/lldb/lit/Register/Inputs/x86-64-gp-write.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-64-gp-write.cpp
diff --git a/lldb/lit/Register/Inputs/x86-64-read.cpp b/lldb/test/Shell/Register/Inputs/x86-64-read.cpp
index fb75d7ebd9e..fb75d7ebd9e 100644
--- a/lldb/lit/Register/Inputs/x86-64-read.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-64-read.cpp
diff --git a/lldb/lit/Register/Inputs/x86-64-write.cpp b/lldb/test/Shell/Register/Inputs/x86-64-write.cpp
index 056f2ebe213..056f2ebe213 100644
--- a/lldb/lit/Register/Inputs/x86-64-write.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-64-write.cpp
diff --git a/lldb/lit/Register/Inputs/x86-gp-read.cpp b/lldb/test/Shell/Register/Inputs/x86-gp-read.cpp
index 4fb725d3906..4fb725d3906 100644
--- a/lldb/lit/Register/Inputs/x86-gp-read.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-gp-read.cpp
diff --git a/lldb/lit/Register/Inputs/x86-gp-write.cpp b/lldb/test/Shell/Register/Inputs/x86-gp-write.cpp
index 1dfbe31b99f..1dfbe31b99f 100644
--- a/lldb/lit/Register/Inputs/x86-gp-write.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-gp-write.cpp
diff --git a/lldb/lit/Register/Inputs/x86-mm-xmm-read.cpp b/lldb/test/Shell/Register/Inputs/x86-mm-xmm-read.cpp
index feb4dde1ad6..feb4dde1ad6 100644
--- a/lldb/lit/Register/Inputs/x86-mm-xmm-read.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-mm-xmm-read.cpp
diff --git a/lldb/lit/Register/Inputs/x86-mm-xmm-write.cpp b/lldb/test/Shell/Register/Inputs/x86-mm-xmm-write.cpp
index 631d6f3a513..631d6f3a513 100644
--- a/lldb/lit/Register/Inputs/x86-mm-xmm-write.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-mm-xmm-write.cpp
diff --git a/lldb/lit/Register/Inputs/x86-ymm-read.cpp b/lldb/test/Shell/Register/Inputs/x86-ymm-read.cpp
index 76f8970d085..76f8970d085 100644
--- a/lldb/lit/Register/Inputs/x86-ymm-read.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-ymm-read.cpp
diff --git a/lldb/lit/Register/Inputs/x86-ymm-write.cpp b/lldb/test/Shell/Register/Inputs/x86-ymm-write.cpp
index 3375853291e..3375853291e 100644
--- a/lldb/lit/Register/Inputs/x86-ymm-write.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-ymm-write.cpp
diff --git a/lldb/lit/Register/Inputs/x86-zmm-read.cpp b/lldb/test/Shell/Register/Inputs/x86-zmm-read.cpp
index 2a1a4fd1114..2a1a4fd1114 100644
--- a/lldb/lit/Register/Inputs/x86-zmm-read.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-zmm-read.cpp
diff --git a/lldb/lit/Register/Inputs/x86-zmm-write.cpp b/lldb/test/Shell/Register/Inputs/x86-zmm-write.cpp
index 4830fb2a742..4830fb2a742 100644
--- a/lldb/lit/Register/Inputs/x86-zmm-write.cpp
+++ b/lldb/test/Shell/Register/Inputs/x86-zmm-write.cpp
diff --git a/lldb/lit/Register/x86-64-gp-read.test b/lldb/test/Shell/Register/x86-64-gp-read.test
index 56f9a631db0..56f9a631db0 100644
--- a/lldb/lit/Register/x86-64-gp-read.test
+++ b/lldb/test/Shell/Register/x86-64-gp-read.test
diff --git a/lldb/lit/Register/x86-64-gp-write.test b/lldb/test/Shell/Register/x86-64-gp-write.test
index c79de92b55a..c79de92b55a 100644
--- a/lldb/lit/Register/x86-64-gp-write.test
+++ b/lldb/test/Shell/Register/x86-64-gp-write.test
diff --git a/lldb/lit/Register/x86-64-read.test b/lldb/test/Shell/Register/x86-64-read.test
index 090b34a7686..090b34a7686 100644
--- a/lldb/lit/Register/x86-64-read.test
+++ b/lldb/test/Shell/Register/x86-64-read.test
diff --git a/lldb/lit/Register/x86-64-write.test b/lldb/test/Shell/Register/x86-64-write.test
index 362e514450f..362e514450f 100644
--- a/lldb/lit/Register/x86-64-write.test
+++ b/lldb/test/Shell/Register/x86-64-write.test
diff --git a/lldb/lit/Register/x86-64-xmm16-read.test b/lldb/test/Shell/Register/x86-64-xmm16-read.test
index 9d060c88cef..9d060c88cef 100644
--- a/lldb/lit/Register/x86-64-xmm16-read.test
+++ b/lldb/test/Shell/Register/x86-64-xmm16-read.test
diff --git a/lldb/lit/Register/x86-64-xmm16-write.test b/lldb/test/Shell/Register/x86-64-xmm16-write.test
index 8c7ad8d7dca..8c7ad8d7dca 100644
--- a/lldb/lit/Register/x86-64-xmm16-write.test
+++ b/lldb/test/Shell/Register/x86-64-xmm16-write.test
diff --git a/lldb/lit/Register/x86-64-ymm-read.test b/lldb/test/Shell/Register/x86-64-ymm-read.test
index dbb5c8a6962..dbb5c8a6962 100644
--- a/lldb/lit/Register/x86-64-ymm-read.test
+++ b/lldb/test/Shell/Register/x86-64-ymm-read.test
diff --git a/lldb/lit/Register/x86-64-ymm-write.test b/lldb/test/Shell/Register/x86-64-ymm-write.test
index 4fe04a92d38..4fe04a92d38 100644
--- a/lldb/lit/Register/x86-64-ymm-write.test
+++ b/lldb/test/Shell/Register/x86-64-ymm-write.test
diff --git a/lldb/lit/Register/x86-64-ymm16-read.test b/lldb/test/Shell/Register/x86-64-ymm16-read.test
index 5d81878c500..5d81878c500 100644
--- a/lldb/lit/Register/x86-64-ymm16-read.test
+++ b/lldb/test/Shell/Register/x86-64-ymm16-read.test
diff --git a/lldb/lit/Register/x86-64-ymm16-write.test b/lldb/test/Shell/Register/x86-64-ymm16-write.test
index c3df572dbc8..c3df572dbc8 100644
--- a/lldb/lit/Register/x86-64-ymm16-write.test
+++ b/lldb/test/Shell/Register/x86-64-ymm16-write.test
diff --git a/lldb/lit/Register/x86-64-zmm-read.test b/lldb/test/Shell/Register/x86-64-zmm-read.test
index 5f42b10652e..5f42b10652e 100644
--- a/lldb/lit/Register/x86-64-zmm-read.test
+++ b/lldb/test/Shell/Register/x86-64-zmm-read.test
diff --git a/lldb/lit/Register/x86-64-zmm-write.test b/lldb/test/Shell/Register/x86-64-zmm-write.test
index 5efa7823fd4..5efa7823fd4 100644
--- a/lldb/lit/Register/x86-64-zmm-write.test
+++ b/lldb/test/Shell/Register/x86-64-zmm-write.test
diff --git a/lldb/lit/Register/x86-gp-read.test b/lldb/test/Shell/Register/x86-gp-read.test
index ed0aa896573..ed0aa896573 100644
--- a/lldb/lit/Register/x86-gp-read.test
+++ b/lldb/test/Shell/Register/x86-gp-read.test
diff --git a/lldb/lit/Register/x86-gp-write.test b/lldb/test/Shell/Register/x86-gp-write.test
index 22f92738a5d..22f92738a5d 100644
--- a/lldb/lit/Register/x86-gp-write.test
+++ b/lldb/test/Shell/Register/x86-gp-write.test
diff --git a/lldb/lit/Register/x86-mm-xmm-read.test b/lldb/test/Shell/Register/x86-mm-xmm-read.test
index ee209551017..ee209551017 100644
--- a/lldb/lit/Register/x86-mm-xmm-read.test
+++ b/lldb/test/Shell/Register/x86-mm-xmm-read.test
diff --git a/lldb/lit/Register/x86-mm-xmm-write.test b/lldb/test/Shell/Register/x86-mm-xmm-write.test
index 7325cf1c3aa..7325cf1c3aa 100644
--- a/lldb/lit/Register/x86-mm-xmm-write.test
+++ b/lldb/test/Shell/Register/x86-mm-xmm-write.test
diff --git a/lldb/lit/Register/x86-ymm-read.test b/lldb/test/Shell/Register/x86-ymm-read.test
index 18fcf0e4cc1..18fcf0e4cc1 100644
--- a/lldb/lit/Register/x86-ymm-read.test
+++ b/lldb/test/Shell/Register/x86-ymm-read.test
diff --git a/lldb/lit/Register/x86-ymm-write.test b/lldb/test/Shell/Register/x86-ymm-write.test
index 9938cdf6719..9938cdf6719 100644
--- a/lldb/lit/Register/x86-ymm-write.test
+++ b/lldb/test/Shell/Register/x86-ymm-write.test
diff --git a/lldb/lit/Register/x86-zmm-read.test b/lldb/test/Shell/Register/x86-zmm-read.test
index a45d1ef97e4..a45d1ef97e4 100644
--- a/lldb/lit/Register/x86-zmm-read.test
+++ b/lldb/test/Shell/Register/x86-zmm-read.test
diff --git a/lldb/lit/Register/x86-zmm-write.test b/lldb/test/Shell/Register/x86-zmm-write.test
index 6a499c311a6..6a499c311a6 100644
--- a/lldb/lit/Register/x86-zmm-write.test
+++ b/lldb/test/Shell/Register/x86-zmm-write.test
diff --git a/lldb/lit/Reproducer/Functionalities/Inputs/DataFormatter.in b/lldb/test/Shell/Reproducer/Functionalities/Inputs/DataFormatter.in
index 5c4e821656d..5c4e821656d 100644
--- a/lldb/lit/Reproducer/Functionalities/Inputs/DataFormatter.in
+++ b/lldb/test/Shell/Reproducer/Functionalities/Inputs/DataFormatter.in
diff --git a/lldb/lit/Reproducer/Functionalities/Inputs/foo.cpp b/lldb/test/Shell/Reproducer/Functionalities/Inputs/foo.cpp
index 91f27388d0c..91f27388d0c 100644
--- a/lldb/lit/Reproducer/Functionalities/Inputs/foo.cpp
+++ b/lldb/test/Shell/Reproducer/Functionalities/Inputs/foo.cpp
diff --git a/lldb/lit/Reproducer/Functionalities/Inputs/stepping.c b/lldb/test/Shell/Reproducer/Functionalities/Inputs/stepping.c
index 7b56eb22193..7b56eb22193 100644
--- a/lldb/lit/Reproducer/Functionalities/Inputs/stepping.c
+++ b/lldb/test/Shell/Reproducer/Functionalities/Inputs/stepping.c
diff --git a/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test b/lldb/test/Shell/Reproducer/Functionalities/TestDataFormatter.test
index 8ee181e8035..8ee181e8035 100644
--- a/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test
+++ b/lldb/test/Shell/Reproducer/Functionalities/TestDataFormatter.test
diff --git a/lldb/lit/Reproducer/Functionalities/TestImageList.test b/lldb/test/Shell/Reproducer/Functionalities/TestImageList.test
index d0abae164f0..d0abae164f0 100644
--- a/lldb/lit/Reproducer/Functionalities/TestImageList.test
+++ b/lldb/test/Shell/Reproducer/Functionalities/TestImageList.test
diff --git a/lldb/lit/Reproducer/Functionalities/TestStepping.test b/lldb/test/Shell/Reproducer/Functionalities/TestStepping.test
index f43680f3e22..f43680f3e22 100644
--- a/lldb/lit/Reproducer/Functionalities/TestStepping.test
+++ b/lldb/test/Shell/Reproducer/Functionalities/TestStepping.test
diff --git a/lldb/lit/Reproducer/Inputs/FileCapture.in b/lldb/test/Shell/Reproducer/Inputs/FileCapture.in
index 2c69487575e..2c69487575e 100644
--- a/lldb/lit/Reproducer/Inputs/FileCapture.in
+++ b/lldb/test/Shell/Reproducer/Inputs/FileCapture.in
diff --git a/lldb/lit/Reproducer/Inputs/GDBRemoteCapture.in b/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in
index e632c821d57..e632c821d57 100644
--- a/lldb/lit/Reproducer/Inputs/GDBRemoteCapture.in
+++ b/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in
diff --git a/lldb/lit/Reproducer/Inputs/simple.c b/lldb/test/Shell/Reproducer/Inputs/simple.c
index ef14878bcf9..ef14878bcf9 100644
--- a/lldb/lit/Reproducer/Inputs/simple.c
+++ b/lldb/test/Shell/Reproducer/Inputs/simple.c
diff --git a/lldb/lit/Reproducer/Modules/Inputs/Bar.h b/lldb/test/Shell/Reproducer/Modules/Inputs/Bar.h
index d004baf3168..d004baf3168 100644
--- a/lldb/lit/Reproducer/Modules/Inputs/Bar.h
+++ b/lldb/test/Shell/Reproducer/Modules/Inputs/Bar.h
diff --git a/lldb/lit/Reproducer/Modules/Inputs/Foo.h b/lldb/test/Shell/Reproducer/Modules/Inputs/Foo.h
index 1fe02e89786..1fe02e89786 100644
--- a/lldb/lit/Reproducer/Modules/Inputs/Foo.h
+++ b/lldb/test/Shell/Reproducer/Modules/Inputs/Foo.h
diff --git a/lldb/lit/Reproducer/Modules/Inputs/ModuleCXX.in b/lldb/test/Shell/Reproducer/Modules/Inputs/ModuleCXX.in
index 0f5bb7864f2..0f5bb7864f2 100644
--- a/lldb/lit/Reproducer/Modules/Inputs/ModuleCXX.in
+++ b/lldb/test/Shell/Reproducer/Modules/Inputs/ModuleCXX.in
diff --git a/lldb/lit/Reproducer/Modules/Inputs/main.cpp b/lldb/test/Shell/Reproducer/Modules/Inputs/main.cpp
index e6a331bb405..e6a331bb405 100644
--- a/lldb/lit/Reproducer/Modules/Inputs/main.cpp
+++ b/lldb/test/Shell/Reproducer/Modules/Inputs/main.cpp
diff --git a/lldb/lit/Reproducer/Modules/Inputs/module.modulemap b/lldb/test/Shell/Reproducer/Modules/Inputs/module.modulemap
index 4221d0f9134..4221d0f9134 100644
--- a/lldb/lit/Reproducer/Modules/Inputs/module.modulemap
+++ b/lldb/test/Shell/Reproducer/Modules/Inputs/module.modulemap
diff --git a/lldb/lit/Reproducer/Modules/TestModuleCXX.test b/lldb/test/Shell/Reproducer/Modules/TestModuleCXX.test
index 843c7e6d1ff..843c7e6d1ff 100644
--- a/lldb/lit/Reproducer/Modules/TestModuleCXX.test
+++ b/lldb/test/Shell/Reproducer/Modules/TestModuleCXX.test
diff --git a/lldb/lit/Reproducer/TestDriverOptions.test b/lldb/test/Shell/Reproducer/TestDriverOptions.test
index 4b5dfbf063c..4b5dfbf063c 100644
--- a/lldb/lit/Reproducer/TestDriverOptions.test
+++ b/lldb/test/Shell/Reproducer/TestDriverOptions.test
diff --git a/lldb/lit/Reproducer/TestDump.test b/lldb/test/Shell/Reproducer/TestDump.test
index 2e717152057..2e717152057 100644
--- a/lldb/lit/Reproducer/TestDump.test
+++ b/lldb/test/Shell/Reproducer/TestDump.test
diff --git a/lldb/lit/Reproducer/TestFileRepro.test b/lldb/test/Shell/Reproducer/TestFileRepro.test
index 31b76703689..31b76703689 100644
--- a/lldb/lit/Reproducer/TestFileRepro.test
+++ b/lldb/test/Shell/Reproducer/TestFileRepro.test
diff --git a/lldb/lit/Reproducer/TestGDBRemoteRepro.test b/lldb/test/Shell/Reproducer/TestGDBRemoteRepro.test
index 09e566ffb95..09e566ffb95 100644
--- a/lldb/lit/Reproducer/TestGDBRemoteRepro.test
+++ b/lldb/test/Shell/Reproducer/TestGDBRemoteRepro.test
diff --git a/lldb/lit/Reproducer/TestRelativePath.test b/lldb/test/Shell/Reproducer/TestRelativePath.test
index 1c871ee81e8..1c871ee81e8 100644
--- a/lldb/lit/Reproducer/TestRelativePath.test
+++ b/lldb/test/Shell/Reproducer/TestRelativePath.test
diff --git a/lldb/lit/Reproducer/TestReuseDirectory.test b/lldb/test/Shell/Reproducer/TestReuseDirectory.test
index 76c74b7ee1d..76c74b7ee1d 100644
--- a/lldb/lit/Reproducer/TestReuseDirectory.test
+++ b/lldb/test/Shell/Reproducer/TestReuseDirectory.test
diff --git a/lldb/lit/Reproducer/TestSynchronous.test b/lldb/test/Shell/Reproducer/TestSynchronous.test
index f32ce8c5722..f32ce8c5722 100644
--- a/lldb/lit/Reproducer/TestSynchronous.test
+++ b/lldb/test/Shell/Reproducer/TestSynchronous.test
diff --git a/lldb/lit/Settings/Inputs/DontStopCommandSource.in b/lldb/test/Shell/Settings/Inputs/DontStopCommandSource.in
index e33a1e329ca..e33a1e329ca 100644
--- a/lldb/lit/Settings/Inputs/DontStopCommandSource.in
+++ b/lldb/test/Shell/Settings/Inputs/DontStopCommandSource.in
diff --git a/lldb/lit/Settings/Inputs/EchoCommandsAll.out b/lldb/test/Shell/Settings/Inputs/EchoCommandsAll.out
index 45b77291976..45b77291976 100644
--- a/lldb/lit/Settings/Inputs/EchoCommandsAll.out
+++ b/lldb/test/Shell/Settings/Inputs/EchoCommandsAll.out
diff --git a/lldb/lit/Settings/Inputs/EchoCommandsNoComments.out b/lldb/test/Shell/Settings/Inputs/EchoCommandsNoComments.out
index a0b653a8f4c..a0b653a8f4c 100644
--- a/lldb/lit/Settings/Inputs/EchoCommandsNoComments.out
+++ b/lldb/test/Shell/Settings/Inputs/EchoCommandsNoComments.out
diff --git a/lldb/lit/Settings/Inputs/EchoCommandsNone.out b/lldb/test/Shell/Settings/Inputs/EchoCommandsNone.out
index fca1bbb50ca..fca1bbb50ca 100644
--- a/lldb/lit/Settings/Inputs/EchoCommandsNone.out
+++ b/lldb/test/Shell/Settings/Inputs/EchoCommandsNone.out
diff --git a/lldb/lit/Settings/Inputs/EchoCommandsQuiet.out b/lldb/test/Shell/Settings/Inputs/EchoCommandsQuiet.out
index 12ad094292d..12ad094292d 100644
--- a/lldb/lit/Settings/Inputs/EchoCommandsQuiet.out
+++ b/lldb/test/Shell/Settings/Inputs/EchoCommandsQuiet.out
diff --git a/lldb/lit/Settings/Inputs/EchoCommandsTest.in b/lldb/test/Shell/Settings/Inputs/EchoCommandsTest.in
index 304648e81e1..304648e81e1 100644
--- a/lldb/lit/Settings/Inputs/EchoCommandsTest.in
+++ b/lldb/test/Shell/Settings/Inputs/EchoCommandsTest.in
diff --git a/lldb/lit/Settings/Inputs/StopCommandSource.in b/lldb/test/Shell/Settings/Inputs/StopCommandSource.in
index 19974c0c444..19974c0c444 100644
--- a/lldb/lit/Settings/Inputs/StopCommandSource.in
+++ b/lldb/test/Shell/Settings/Inputs/StopCommandSource.in
diff --git a/lldb/lit/Settings/Inputs/main.c b/lldb/test/Shell/Settings/Inputs/main.c
index c029ddd96cd..c029ddd96cd 100644
--- a/lldb/lit/Settings/Inputs/main.c
+++ b/lldb/test/Shell/Settings/Inputs/main.c
diff --git a/lldb/lit/Settings/TestDisableColor.test b/lldb/test/Shell/Settings/TestDisableColor.test
index 659e2073fa2..659e2073fa2 100644
--- a/lldb/lit/Settings/TestDisableColor.test
+++ b/lldb/test/Shell/Settings/TestDisableColor.test
diff --git a/lldb/lit/Settings/TestDisassemblyFormat.test b/lldb/test/Shell/Settings/TestDisassemblyFormat.test
index 29975a1b016..29975a1b016 100644
--- a/lldb/lit/Settings/TestDisassemblyFormat.test
+++ b/lldb/test/Shell/Settings/TestDisassemblyFormat.test
diff --git a/lldb/lit/Settings/TestEchoCommands.test b/lldb/test/Shell/Settings/TestEchoCommands.test
index 67547eaabf8..67547eaabf8 100644
--- a/lldb/lit/Settings/TestEchoCommands.test
+++ b/lldb/test/Shell/Settings/TestEchoCommands.test
diff --git a/lldb/lit/Settings/TestFrameFormatColor.test b/lldb/test/Shell/Settings/TestFrameFormatColor.test
index 87be0a3749f..87be0a3749f 100644
--- a/lldb/lit/Settings/TestFrameFormatColor.test
+++ b/lldb/test/Shell/Settings/TestFrameFormatColor.test
diff --git a/lldb/lit/Settings/TestFrameFormatNoColor.test b/lldb/test/Shell/Settings/TestFrameFormatNoColor.test
index dd1a320f882..dd1a320f882 100644
--- a/lldb/lit/Settings/TestFrameFormatNoColor.test
+++ b/lldb/test/Shell/Settings/TestFrameFormatNoColor.test
diff --git a/lldb/lit/Settings/TestModuleCacheSanity.test b/lldb/test/Shell/Settings/TestModuleCacheSanity.test
index f16f40d47a6..f16f40d47a6 100644
--- a/lldb/lit/Settings/TestModuleCacheSanity.test
+++ b/lldb/test/Shell/Settings/TestModuleCacheSanity.test
diff --git a/lldb/lit/Settings/TestSettingsSet.test b/lldb/test/Shell/Settings/TestSettingsSet.test
index 0def3faaadb..0def3faaadb 100644
--- a/lldb/lit/Settings/TestSettingsSet.test
+++ b/lldb/test/Shell/Settings/TestSettingsSet.test
diff --git a/lldb/lit/Settings/TestSettingsWrite.test b/lldb/test/Shell/Settings/TestSettingsWrite.test
index 72dcd73e33f..72dcd73e33f 100644
--- a/lldb/lit/Settings/TestSettingsWrite.test
+++ b/lldb/test/Shell/Settings/TestSettingsWrite.test
diff --git a/lldb/lit/Settings/TestStopCommandSourceOnError.test b/lldb/test/Shell/Settings/TestStopCommandSourceOnError.test
index a53dc2cd686..a53dc2cd686 100644
--- a/lldb/lit/Settings/TestStopCommandSourceOnError.test
+++ b/lldb/test/Shell/Settings/TestStopCommandSourceOnError.test
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/basic-elf.yaml b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/basic-elf.yaml
index 905dc25c3a6..905dc25c3a6 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/basic-elf.yaml
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/basic-elf.yaml
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/basic-macho.yaml b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/basic-macho.yaml
index 9a4505c204d..9a4505c204d 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/basic-macho.yaml
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/basic-macho.yaml
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table-discontinuous-file-ids.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table-discontinuous-file-ids.syms
index f19d5374056..f19d5374056 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table-discontinuous-file-ids.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table-discontinuous-file-ids.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table-edgecases.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table-edgecases.syms
index 069b79cc57d..069b79cc57d 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table-edgecases.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table-edgecases.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table-missing-file.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table-missing-file.syms
index 635716c6b06..635716c6b06 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table-missing-file.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table-missing-file.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table-mixed-path-styles.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table-mixed-path-styles.syms
index a0708e54dc0..a0708e54dc0 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table-mixed-path-styles.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table-mixed-path-styles.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table.syms
index e608eb8033e..e608eb8033e 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/line-table.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/line-table.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.syms
index 1ebecb48022..1ebecb48022 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.yaml b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.yaml
index 9f3a6316986..9f3a6316986 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.yaml
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.yaml
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/symtab-macho.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/symtab-macho.syms
index da6a7568698..da6a7568698 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/symtab-macho.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/symtab-macho.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/symtab.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/symtab.syms
index 3fd14643bb0..3fd14643bb0 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/symtab.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/symtab.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-raSearch.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-raSearch.syms
index 329a280bde8..329a280bde8 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-raSearch.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-raSearch.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.syms
index d4c8287e68a..d4c8287e68a 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.yaml b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.yaml
index 0672f9e6123..0672f9e6123 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.yaml
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.yaml
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.syms b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.syms
index b9b8a67095f..b9b8a67095f 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.syms
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.syms
diff --git a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.yaml b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.yaml
index 399cf2bbaa3..399cf2bbaa3 100644
--- a/lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.yaml
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.yaml
diff --git a/lldb/lit/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test
index 3b48f4f3c5a..3b48f4f3c5a 100644
--- a/lldb/lit/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test
diff --git a/lldb/lit/SymbolFile/Breakpad/line-table-edgecases.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table-edgecases.test
index 3a097725a97..3a097725a97 100644
--- a/lldb/lit/SymbolFile/Breakpad/line-table-edgecases.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table-edgecases.test
diff --git a/lldb/lit/SymbolFile/Breakpad/line-table-missing-file.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table-missing-file.test
index 0c0fb3f8ea8..0c0fb3f8ea8 100644
--- a/lldb/lit/SymbolFile/Breakpad/line-table-missing-file.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table-missing-file.test
diff --git a/lldb/lit/SymbolFile/Breakpad/line-table-mixed-path-styles.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table-mixed-path-styles.test
index 617b5eb6a9f..617b5eb6a9f 100644
--- a/lldb/lit/SymbolFile/Breakpad/line-table-mixed-path-styles.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table-mixed-path-styles.test
diff --git a/lldb/lit/SymbolFile/Breakpad/line-table.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table.test
index f5661cf7ee9..f5661cf7ee9 100644
--- a/lldb/lit/SymbolFile/Breakpad/line-table.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table.test
diff --git a/lldb/lit/SymbolFile/Breakpad/stack-cfi-parsing.test b/lldb/test/Shell/SymbolFile/Breakpad/stack-cfi-parsing.test
index ffb64602c15..ffb64602c15 100644
--- a/lldb/lit/SymbolFile/Breakpad/stack-cfi-parsing.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/stack-cfi-parsing.test
diff --git a/lldb/lit/SymbolFile/Breakpad/symtab-macho.test b/lldb/test/Shell/SymbolFile/Breakpad/symtab-macho.test
index 59538649d8f..59538649d8f 100644
--- a/lldb/lit/SymbolFile/Breakpad/symtab-macho.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/symtab-macho.test
diff --git a/lldb/lit/SymbolFile/Breakpad/symtab.test b/lldb/test/Shell/SymbolFile/Breakpad/symtab.test
index 65bf9517461..65bf9517461 100644
--- a/lldb/lit/SymbolFile/Breakpad/symtab.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/symtab.test
diff --git a/lldb/lit/SymbolFile/Breakpad/unwind-via-raSearch.test b/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-raSearch.test
index ea259a9de7e..ea259a9de7e 100644
--- a/lldb/lit/SymbolFile/Breakpad/unwind-via-raSearch.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-raSearch.test
diff --git a/lldb/lit/SymbolFile/Breakpad/unwind-via-stack-cfi.test b/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-stack-cfi.test
index 9a6c2166c13..9a6c2166c13 100644
--- a/lldb/lit/SymbolFile/Breakpad/unwind-via-stack-cfi.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-stack-cfi.test
diff --git a/lldb/lit/SymbolFile/Breakpad/unwind-via-stack-win.test b/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-stack-win.test
index 2e04ed68844..2e04ed68844 100644
--- a/lldb/lit/SymbolFile/Breakpad/unwind-via-stack-win.test
+++ b/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-stack-win.test
diff --git a/lldb/lit/SymbolFile/DWARF/Inputs/debug-line-basic.script b/lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-line-basic.script
index 7f3a1b9c2ff..7f3a1b9c2ff 100644
--- a/lldb/lit/SymbolFile/DWARF/Inputs/debug-line-basic.script
+++ b/lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-line-basic.script
diff --git a/lldb/lit/SymbolFile/DWARF/Inputs/debug-types-basic.cpp b/lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-types-basic.cpp
index defa8ba5c69..defa8ba5c69 100644
--- a/lldb/lit/SymbolFile/DWARF/Inputs/debug-types-basic.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-types-basic.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/Inputs/debug-types-expressions.cpp b/lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-types-expressions.cpp
index fe728cf040d..fe728cf040d 100644
--- a/lldb/lit/SymbolFile/DWARF/Inputs/debug-types-expressions.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-types-expressions.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit b/lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
index 390408ec8cc..390408ec8cc 100644
--- a/lldb/lit/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
+++ b/lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
diff --git a/lldb/lit/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit b/lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit
index 73a8a491bb2..73a8a491bb2 100644
--- a/lldb/lit/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit
+++ b/lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit
diff --git a/lldb/lit/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit b/lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit
index 8737aafc8a2..8737aafc8a2 100644
--- a/lldb/lit/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit
+++ b/lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit
diff --git a/lldb/lit/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp b/lldb/test/Shell/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp
index cd02cb07c62..cd02cb07c62 100644
--- a/lldb/lit/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/apple-index-is-used.cpp b/lldb/test/Shell/SymbolFile/DWARF/apple-index-is-used.cpp
index 00440531e99..00440531e99 100644
--- a/lldb/lit/SymbolFile/DWARF/apple-index-is-used.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/apple-index-is-used.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/array-sizes.s b/lldb/test/Shell/SymbolFile/DWARF/array-sizes.s
index f00fe2ad005..f00fe2ad005 100644
--- a/lldb/lit/SymbolFile/DWARF/array-sizes.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/array-sizes.s
diff --git a/lldb/lit/SymbolFile/DWARF/childless-compile-unit.s b/lldb/test/Shell/SymbolFile/DWARF/childless-compile-unit.s
index a47c378ffe3..a47c378ffe3 100644
--- a/lldb/lit/SymbolFile/DWARF/childless-compile-unit.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/childless-compile-unit.s
diff --git a/lldb/lit/SymbolFile/DWARF/compilercontext.ll b/lldb/test/Shell/SymbolFile/DWARF/compilercontext.ll
index 6097345bd99..6097345bd99 100644
--- a/lldb/lit/SymbolFile/DWARF/compilercontext.ll
+++ b/lldb/test/Shell/SymbolFile/DWARF/compilercontext.ll
diff --git a/lldb/lit/SymbolFile/DWARF/debug-line-basic.s b/lldb/test/Shell/SymbolFile/DWARF/debug-line-basic.s
index a1100ba8d9c..a1100ba8d9c 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-line-basic.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-line-basic.s
diff --git a/lldb/lit/SymbolFile/DWARF/debug-names-compressed.cpp b/lldb/test/Shell/SymbolFile/DWARF/debug-names-compressed.cpp
index aeb0ff1d01b..aeb0ff1d01b 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-names-compressed.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-names-compressed.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/debug-types-address-ranges.s b/lldb/test/Shell/SymbolFile/DWARF/debug-types-address-ranges.s
index e87f8c8569d..e87f8c8569d 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-types-address-ranges.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-types-address-ranges.s
diff --git a/lldb/lit/SymbolFile/DWARF/debug-types-basic.test b/lldb/test/Shell/SymbolFile/DWARF/debug-types-basic.test
index 24a6a651d5f..24a6a651d5f 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-types-basic.test
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-types-basic.test
diff --git a/lldb/lit/SymbolFile/DWARF/debug-types-dwarf5.s b/lldb/test/Shell/SymbolFile/DWARF/debug-types-dwarf5.s
index 9de61e48ef7..9de61e48ef7 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-types-dwarf5.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-types-dwarf5.s
diff --git a/lldb/lit/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp b/lldb/test/Shell/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp
index 29adff62cd1..29adff62cd1 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/debug-types-expressions.test b/lldb/test/Shell/SymbolFile/DWARF/debug-types-expressions.test
index 6da06d7b74f..6da06d7b74f 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-types-expressions.test
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-types-expressions.test
diff --git a/lldb/lit/SymbolFile/DWARF/debug-types-line-tables.s b/lldb/test/Shell/SymbolFile/DWARF/debug-types-line-tables.s
index 803f93ff679..803f93ff679 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-types-line-tables.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-types-line-tables.s
diff --git a/lldb/lit/SymbolFile/DWARF/debug-types-missing-signature.test b/lldb/test/Shell/SymbolFile/DWARF/debug-types-missing-signature.test
index f9c02061fc8..f9c02061fc8 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-types-missing-signature.test
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-types-missing-signature.test
diff --git a/lldb/lit/SymbolFile/DWARF/debug-types-signature-loop.s b/lldb/test/Shell/SymbolFile/DWARF/debug-types-signature-loop.s
index addab83ddcc..addab83ddcc 100644
--- a/lldb/lit/SymbolFile/DWARF/debug-types-signature-loop.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug-types-signature-loop.s
diff --git a/lldb/lit/SymbolFile/DWARF/debug_aranges-empty-section.s b/lldb/test/Shell/SymbolFile/DWARF/debug_aranges-empty-section.s
index 4e9fabdf64a..4e9fabdf64a 100644
--- a/lldb/lit/SymbolFile/DWARF/debug_aranges-empty-section.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug_aranges-empty-section.s
diff --git a/lldb/lit/SymbolFile/DWARF/debug_loc.s b/lldb/test/Shell/SymbolFile/DWARF/debug_loc.s
index 8dec979f694..8dec979f694 100644
--- a/lldb/lit/SymbolFile/DWARF/debug_loc.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug_loc.s
diff --git a/lldb/lit/SymbolFile/DWARF/debug_ranges-missing-section.s b/lldb/test/Shell/SymbolFile/DWARF/debug_ranges-missing-section.s
index 98d4e91c3e1..98d4e91c3e1 100644
--- a/lldb/lit/SymbolFile/DWARF/debug_ranges-missing-section.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug_ranges-missing-section.s
diff --git a/lldb/lit/SymbolFile/DWARF/debug_ranges.s b/lldb/test/Shell/SymbolFile/DWARF/debug_ranges.s
index bbe5cb220c2..bbe5cb220c2 100644
--- a/lldb/lit/SymbolFile/DWARF/debug_ranges.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug_ranges.s
diff --git a/lldb/lit/SymbolFile/DWARF/debug_ranges_and_rnglists.test b/lldb/test/Shell/SymbolFile/DWARF/debug_ranges_and_rnglists.test
index 49bb4e7a189..49bb4e7a189 100644
--- a/lldb/lit/SymbolFile/DWARF/debug_ranges_and_rnglists.test
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug_ranges_and_rnglists.test
diff --git a/lldb/lit/SymbolFile/DWARF/debug_rnglists.s b/lldb/test/Shell/SymbolFile/DWARF/debug_rnglists.s
index 5d95b80e8da..5d95b80e8da 100644
--- a/lldb/lit/SymbolFile/DWARF/debug_rnglists.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/debug_rnglists.s
diff --git a/lldb/lit/SymbolFile/DWARF/deterministic-build.cpp b/lldb/test/Shell/SymbolFile/DWARF/deterministic-build.cpp
index 576c4ab7244..576c4ab7244 100644
--- a/lldb/lit/SymbolFile/DWARF/deterministic-build.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/deterministic-build.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s b/lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s
index 7fee15d65ca..7fee15d65ca 100644
--- a/lldb/lit/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s
diff --git a/lldb/lit/SymbolFile/DWARF/dir-separator-no-comp-dir.s b/lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir.s
index de6bde9b5c6..de6bde9b5c6 100644
--- a/lldb/lit/SymbolFile/DWARF/dir-separator-no-comp-dir.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir.s
diff --git a/lldb/lit/SymbolFile/DWARF/dir-separator-posix.s b/lldb/test/Shell/SymbolFile/DWARF/dir-separator-posix.s
index d6466708919..d6466708919 100644
--- a/lldb/lit/SymbolFile/DWARF/dir-separator-posix.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/dir-separator-posix.s
diff --git a/lldb/lit/SymbolFile/DWARF/dir-separator-windows.s b/lldb/test/Shell/SymbolFile/DWARF/dir-separator-windows.s
index d64033546f7..d64033546f7 100644
--- a/lldb/lit/SymbolFile/DWARF/dir-separator-windows.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/dir-separator-windows.s
diff --git a/lldb/lit/SymbolFile/DWARF/dwarf5-index-is-used.cpp b/lldb/test/Shell/SymbolFile/DWARF/dwarf5-index-is-used.cpp
index f5122ebadae..f5122ebadae 100644
--- a/lldb/lit/SymbolFile/DWARF/dwarf5-index-is-used.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/dwarf5-index-is-used.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/dwarf5-partial-index.cpp b/lldb/test/Shell/SymbolFile/DWARF/dwarf5-partial-index.cpp
index 84e3b62e17b..84e3b62e17b 100644
--- a/lldb/lit/SymbolFile/DWARF/dwarf5-partial-index.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/dwarf5-partial-index.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/dwarf5_locations.s b/lldb/test/Shell/SymbolFile/DWARF/dwarf5_locations.s
index 4093ea05980..4093ea05980 100644
--- a/lldb/lit/SymbolFile/DWARF/dwarf5_locations.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/dwarf5_locations.s
diff --git a/lldb/lit/SymbolFile/DWARF/find-basic-function.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-basic-function.cpp
index 3d175f63e04..3d175f63e04 100644
--- a/lldb/lit/SymbolFile/DWARF/find-basic-function.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-basic-function.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-basic-namespace.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-basic-namespace.cpp
index e7655a37053..e7655a37053 100644
--- a/lldb/lit/SymbolFile/DWARF/find-basic-namespace.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-basic-namespace.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-basic-type.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-basic-type.cpp
index 060a5b41eeb..060a5b41eeb 100644
--- a/lldb/lit/SymbolFile/DWARF/find-basic-type.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-basic-type.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-basic-variable.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-basic-variable.cpp
index bca8f27e1d4..bca8f27e1d4 100644
--- a/lldb/lit/SymbolFile/DWARF/find-basic-variable.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-basic-variable.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-function-regex.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-function-regex.cpp
index b1e9d10e82a..b1e9d10e82a 100644
--- a/lldb/lit/SymbolFile/DWARF/find-function-regex.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-function-regex.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-inline-method.s b/lldb/test/Shell/SymbolFile/DWARF/find-inline-method.s
index cfc5ef01dd3..cfc5ef01dd3 100644
--- a/lldb/lit/SymbolFile/DWARF/find-inline-method.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-inline-method.s
diff --git a/lldb/lit/SymbolFile/DWARF/find-method-local-struct.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-method-local-struct.cpp
index 3da4a4a23f8..3da4a4a23f8 100644
--- a/lldb/lit/SymbolFile/DWARF/find-method-local-struct.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-method-local-struct.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-method.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-method.cpp
index 7e7710fd472..7e7710fd472 100644
--- a/lldb/lit/SymbolFile/DWARF/find-method.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-method.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-qualified-variable.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-qualified-variable.cpp
index 1ad3e7fbadf..1ad3e7fbadf 100644
--- a/lldb/lit/SymbolFile/DWARF/find-qualified-variable.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-qualified-variable.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-type-in-function.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-type-in-function.cpp
index 5c1b4b44523..5c1b4b44523 100644
--- a/lldb/lit/SymbolFile/DWARF/find-type-in-function.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-type-in-function.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-variable-dwo.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-variable-dwo.cpp
index b2fb1a375cf..b2fb1a375cf 100644
--- a/lldb/lit/SymbolFile/DWARF/find-variable-dwo.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-variable-dwo.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/find-variable-file.cpp b/lldb/test/Shell/SymbolFile/DWARF/find-variable-file.cpp
index 550896cc707..550896cc707 100644
--- a/lldb/lit/SymbolFile/DWARF/find-variable-file.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/find-variable-file.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/forward-declarations.s b/lldb/test/Shell/SymbolFile/DWARF/forward-declarations.s
index 952c4ee7f87..952c4ee7f87 100644
--- a/lldb/lit/SymbolFile/DWARF/forward-declarations.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/forward-declarations.s
diff --git a/lldb/lit/SymbolFile/DWARF/gnu-style-compression.cpp b/lldb/test/Shell/SymbolFile/DWARF/gnu-style-compression.cpp
index 9dc87303ba9..9dc87303ba9 100644
--- a/lldb/lit/SymbolFile/DWARF/gnu-style-compression.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/gnu-style-compression.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/lit.local.cfg b/lldb/test/Shell/SymbolFile/DWARF/lit.local.cfg
index d7ddcbf641c..d7ddcbf641c 100644
--- a/lldb/lit/SymbolFile/DWARF/lit.local.cfg
+++ b/lldb/test/Shell/SymbolFile/DWARF/lit.local.cfg
diff --git a/lldb/lit/SymbolFile/DWARF/parallel-indexing-stress.s b/lldb/test/Shell/SymbolFile/DWARF/parallel-indexing-stress.s
index 94b35e5c114..94b35e5c114 100644
--- a/lldb/lit/SymbolFile/DWARF/parallel-indexing-stress.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/parallel-indexing-stress.s
diff --git a/lldb/lit/SymbolFile/DWARF/split-dwarf-inlining.cpp b/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-inlining.cpp
index 5873d896b19..5873d896b19 100644
--- a/lldb/lit/SymbolFile/DWARF/split-dwarf-inlining.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-inlining.cpp
diff --git a/lldb/lit/SymbolFile/DWARF/split-dwarf-multiple-cu.ll b/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-multiple-cu.ll
index 9c2348750cf..9c2348750cf 100644
--- a/lldb/lit/SymbolFile/DWARF/split-dwarf-multiple-cu.ll
+++ b/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-multiple-cu.ll
diff --git a/lldb/lit/SymbolFile/Inputs/sizeless-symbol.s b/lldb/test/Shell/SymbolFile/Inputs/sizeless-symbol.s
index ac08dddb0e2..ac08dddb0e2 100644
--- a/lldb/lit/SymbolFile/Inputs/sizeless-symbol.s
+++ b/lldb/test/Shell/SymbolFile/Inputs/sizeless-symbol.s
diff --git a/lldb/lit/SymbolFile/Inputs/target-symbols-add-unwind.c b/lldb/test/Shell/SymbolFile/Inputs/target-symbols-add-unwind.c
index 237c8ce1817..237c8ce1817 100644
--- a/lldb/lit/SymbolFile/Inputs/target-symbols-add-unwind.c
+++ b/lldb/test/Shell/SymbolFile/Inputs/target-symbols-add-unwind.c
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/ast-functions.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ast-functions.lldbinit
index c25d96c531d..c25d96c531d 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/ast-functions.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ast-functions.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/ast-methods.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ast-methods.lldbinit
index 6d593589c4a..6d593589c4a 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/ast-methods.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ast-methods.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/ast-types.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ast-types.lldbinit
index b317c4ab343..b317c4ab343 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/ast-types.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ast-types.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/bitfields.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/bitfields.lldbinit
index cf06c494e67..cf06c494e67 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/bitfields.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/bitfields.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/break-by-function.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/break-by-function.lldbinit
index ff9bf21a886..ff9bf21a886 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/break-by-function.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/break-by-function.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/break-by-line.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/break-by-line.lldbinit
index 7daa53ba24e..7daa53ba24e 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/break-by-line.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/break-by-line.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/disassembly.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/disassembly.lldbinit
index 2b552a0b01d..2b552a0b01d 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/disassembly.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/disassembly.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/function-types-builtins.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/function-types-builtins.lldbinit
index fe29896b5f5..fe29896b5f5 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/function-types-builtins.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/function-types-builtins.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/function-types-calling-conv.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/function-types-calling-conv.lldbinit
index 8664881b262..8664881b262 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/function-types-calling-conv.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/function-types-calling-conv.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/function-types-classes.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/function-types-classes.lldbinit
index c06c650e1c4..c06c650e1c4 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/function-types-classes.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/function-types-classes.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit
index 9bf066ee2af..9bf066ee2af 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/globals-classes.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/globals-classes.lldbinit
index cafb863d85f..cafb863d85f 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/globals-classes.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/globals-classes.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/globals-fundamental.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/globals-fundamental.lldbinit
index 4af8b658742..4af8b658742 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/globals-fundamental.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/globals-fundamental.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/local-variables.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
index 0d7371e86f1..0d7371e86f1 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/nested-types.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/nested-types.lldbinit
index 466df81fc42..466df81fc42 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/nested-types.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/nested-types.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/s_constant.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/s_constant.lldbinit
index 1a50d808cdc..1a50d808cdc 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/s_constant.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/s_constant.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/s_constant.s b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/s_constant.s
index 6eaa80cf850..6eaa80cf850 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/s_constant.s
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/s_constant.s
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/source-list.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/source-list.lldbinit
index 624ce5ba156..624ce5ba156 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/source-list.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/source-list.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/stack_unwinding01.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/stack_unwinding01.lldbinit
index d035d3bb881..d035d3bb881 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/stack_unwinding01.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/stack_unwinding01.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/Inputs/tag-types.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/tag-types.lldbinit
index a7ec496447e..a7ec496447e 100644
--- a/lldb/lit/SymbolFile/NativePDB/Inputs/tag-types.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/tag-types.lldbinit
diff --git a/lldb/lit/SymbolFile/NativePDB/ast-functions-msvc.cpp b/lldb/test/Shell/SymbolFile/NativePDB/ast-functions-msvc.cpp
index b8154168aff..b8154168aff 100644
--- a/lldb/lit/SymbolFile/NativePDB/ast-functions-msvc.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/ast-functions-msvc.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/ast-functions.cpp b/lldb/test/Shell/SymbolFile/NativePDB/ast-functions.cpp
index 1cfd01f13c1..1cfd01f13c1 100644
--- a/lldb/lit/SymbolFile/NativePDB/ast-functions.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/ast-functions.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/ast-methods.cpp b/lldb/test/Shell/SymbolFile/NativePDB/ast-methods.cpp
index 6006c722cfb..6006c722cfb 100644
--- a/lldb/lit/SymbolFile/NativePDB/ast-methods.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/ast-methods.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/ast-types.cpp b/lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
index 9d4ac139f59..9d4ac139f59 100644
--- a/lldb/lit/SymbolFile/NativePDB/ast-types.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/bitfields.cpp b/lldb/test/Shell/SymbolFile/NativePDB/bitfields.cpp
index 301ae3067d1..301ae3067d1 100644
--- a/lldb/lit/SymbolFile/NativePDB/bitfields.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/bitfields.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/break-by-function.cpp b/lldb/test/Shell/SymbolFile/NativePDB/break-by-function.cpp
index c0c26f7617c..c0c26f7617c 100644
--- a/lldb/lit/SymbolFile/NativePDB/break-by-function.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/break-by-function.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/break-by-line.cpp b/lldb/test/Shell/SymbolFile/NativePDB/break-by-line.cpp
index ae3269f3719..ae3269f3719 100644
--- a/lldb/lit/SymbolFile/NativePDB/break-by-line.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/break-by-line.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/disassembly.cpp b/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp
index 3553f29ce55..3553f29ce55 100644
--- a/lldb/lit/SymbolFile/NativePDB/disassembly.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/function-types-builtins.cpp b/lldb/test/Shell/SymbolFile/NativePDB/function-types-builtins.cpp
index 05ad6841993..05ad6841993 100644
--- a/lldb/lit/SymbolFile/NativePDB/function-types-builtins.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/function-types-builtins.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/function-types-calling-conv.cpp b/lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp
index cd13159d508..cd13159d508 100644
--- a/lldb/lit/SymbolFile/NativePDB/function-types-calling-conv.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp b/lldb/test/Shell/SymbolFile/NativePDB/function-types-classes.cpp
index 4a8caa7f837..4a8caa7f837 100644
--- a/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/function-types-classes.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/global-classes.cpp b/lldb/test/Shell/SymbolFile/NativePDB/global-classes.cpp
index e45fbfa4eef..e45fbfa4eef 100644
--- a/lldb/lit/SymbolFile/NativePDB/global-classes.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/global-classes.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/globals-bss.cpp b/lldb/test/Shell/SymbolFile/NativePDB/globals-bss.cpp
index c10c3c19628..c10c3c19628 100644
--- a/lldb/lit/SymbolFile/NativePDB/globals-bss.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/globals-bss.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp b/lldb/test/Shell/SymbolFile/NativePDB/globals-fundamental.cpp
index 48dea6d51e4..48dea6d51e4 100644
--- a/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/globals-fundamental.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/local-variables.cpp b/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp
index a7e786dc4e5..a7e786dc4e5 100644
--- a/lldb/lit/SymbolFile/NativePDB/local-variables.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/nested-types.cpp b/lldb/test/Shell/SymbolFile/NativePDB/nested-types.cpp
index e9bee690d30..e9bee690d30 100644
--- a/lldb/lit/SymbolFile/NativePDB/nested-types.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/nested-types.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/s_constant.cpp b/lldb/test/Shell/SymbolFile/NativePDB/s_constant.cpp
index 7603a4daba4..7603a4daba4 100644
--- a/lldb/lit/SymbolFile/NativePDB/s_constant.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/s_constant.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/source-list.cpp b/lldb/test/Shell/SymbolFile/NativePDB/source-list.cpp
index 6b749b082e3..6b749b082e3 100644
--- a/lldb/lit/SymbolFile/NativePDB/source-list.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/source-list.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/stack_unwinding01.cpp b/lldb/test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp
index 701b843fa12..701b843fa12 100644
--- a/lldb/lit/SymbolFile/NativePDB/stack_unwinding01.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/tag-types.cpp b/lldb/test/Shell/SymbolFile/NativePDB/tag-types.cpp
index db981eafa6e..db981eafa6e 100644
--- a/lldb/lit/SymbolFile/NativePDB/tag-types.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/tag-types.cpp
diff --git a/lldb/lit/SymbolFile/NativePDB/typedefs.cpp b/lldb/test/Shell/SymbolFile/NativePDB/typedefs.cpp
index e303a4f4363..e303a4f4363 100644
--- a/lldb/lit/SymbolFile/NativePDB/typedefs.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/typedefs.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/AstRestoreTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/AstRestoreTest.cpp
index 8c9e26744d5..8c9e26744d5 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/AstRestoreTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/AstRestoreTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp
index 60854c04c60..60854c04c60 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp
index 3c4b005cdf1..3c4b005cdf1 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/CompilandsTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/CompilandsTest.cpp
index 4cce7f667ff..4cce7f667ff 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/CompilandsTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/CompilandsTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest.cpp
index 3785cd3c64c..3785cd3c64c 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest0.script b/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest0.script
index d31a2abb68a..d31a2abb68a 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest0.script
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest0.script
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest1.script b/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest1.script
index dac887faa5b..dac887faa5b 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest1.script
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest1.script
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest2.script b/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest2.script
index b19240baf99..b19240baf99 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest2.script
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest2.script
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/FuncSymbols.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/FuncSymbols.cpp
index ccccf6ffd10..ccccf6ffd10 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/FuncSymbols.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/FuncSymbols.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp
index 17eeab7117b..17eeab7117b 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp
index fa0030bacbf..fa0030bacbf 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h
index 0cc9d80d85d..0cc9d80d85d 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord
index 48abd0b872f..48abd0b872f 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp
index 62e201df5fe..62e201df5fe 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/PointerTypeTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/PointerTypeTest.cpp
index 6612c30f00d..6612c30f00d 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/PointerTypeTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/PointerTypeTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp
index de13a5b430c..de13a5b430c 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/TypeQualsTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/TypeQualsTest.cpp
index bedafcdacfc..bedafcdacfc 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/TypeQualsTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/TypeQualsTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/UdtLayoutTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/UdtLayoutTest.cpp
index 59a4fc585d7..59a4fc585d7 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/UdtLayoutTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/UdtLayoutTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/UdtLayoutTest.script b/lldb/test/Shell/SymbolFile/PDB/Inputs/UdtLayoutTest.script
index 91de55f4ade..91de55f4ade 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/UdtLayoutTest.script
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/UdtLayoutTest.script
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/VBases.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.cpp
index a5e84bd3657..a5e84bd3657 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/VBases.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/VBases.script b/lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.script
index 8675890b76e..8675890b76e 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/VBases.script
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.script
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp
index 7b7180a3ec4..7b7180a3ec4 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.script b/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.script
index 7dd90352cce..7dd90352cce 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.script
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.script
diff --git a/lldb/lit/SymbolFile/PDB/Inputs/VariablesTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesTest.cpp
index 304d9056609..304d9056609 100644
--- a/lldb/lit/SymbolFile/PDB/Inputs/VariablesTest.cpp
+++ b/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesTest.cpp
diff --git a/lldb/lit/SymbolFile/PDB/ast-restore.test b/lldb/test/Shell/SymbolFile/PDB/ast-restore.test
index 14ec0d52f2e..14ec0d52f2e 100644
--- a/lldb/lit/SymbolFile/PDB/ast-restore.test
+++ b/lldb/test/Shell/SymbolFile/PDB/ast-restore.test
diff --git a/lldb/lit/SymbolFile/PDB/calling-conventions.test b/lldb/test/Shell/SymbolFile/PDB/calling-conventions.test
index a85dc65ff04..a85dc65ff04 100644
--- a/lldb/lit/SymbolFile/PDB/calling-conventions.test
+++ b/lldb/test/Shell/SymbolFile/PDB/calling-conventions.test
diff --git a/lldb/lit/SymbolFile/PDB/class-layout.test b/lldb/test/Shell/SymbolFile/PDB/class-layout.test
index fcd6b610826..fcd6b610826 100644
--- a/lldb/lit/SymbolFile/PDB/class-layout.test
+++ b/lldb/test/Shell/SymbolFile/PDB/class-layout.test
diff --git a/lldb/lit/SymbolFile/PDB/compilands.test b/lldb/test/Shell/SymbolFile/PDB/compilands.test
index 0bda82ee236..0bda82ee236 100644
--- a/lldb/lit/SymbolFile/PDB/compilands.test
+++ b/lldb/test/Shell/SymbolFile/PDB/compilands.test
diff --git a/lldb/lit/SymbolFile/PDB/enums-layout.test b/lldb/test/Shell/SymbolFile/PDB/enums-layout.test
index 79efb259663..79efb259663 100644
--- a/lldb/lit/SymbolFile/PDB/enums-layout.test
+++ b/lldb/test/Shell/SymbolFile/PDB/enums-layout.test
diff --git a/lldb/lit/SymbolFile/PDB/expressions.test b/lldb/test/Shell/SymbolFile/PDB/expressions.test
index 49016196117..49016196117 100644
--- a/lldb/lit/SymbolFile/PDB/expressions.test
+++ b/lldb/test/Shell/SymbolFile/PDB/expressions.test
diff --git a/lldb/lit/SymbolFile/PDB/func-symbols.test b/lldb/test/Shell/SymbolFile/PDB/func-symbols.test
index 676be1c632b..676be1c632b 100644
--- a/lldb/lit/SymbolFile/PDB/func-symbols.test
+++ b/lldb/test/Shell/SymbolFile/PDB/func-symbols.test
diff --git a/lldb/lit/SymbolFile/PDB/function-level-linking.test b/lldb/test/Shell/SymbolFile/PDB/function-level-linking.test
index 37b2cbc761b..37b2cbc761b 100644
--- a/lldb/lit/SymbolFile/PDB/function-level-linking.test
+++ b/lldb/test/Shell/SymbolFile/PDB/function-level-linking.test
diff --git a/lldb/lit/SymbolFile/PDB/function-nested-block.test b/lldb/test/Shell/SymbolFile/PDB/function-nested-block.test
index 9057d01c258..9057d01c258 100644
--- a/lldb/lit/SymbolFile/PDB/function-nested-block.test
+++ b/lldb/test/Shell/SymbolFile/PDB/function-nested-block.test
diff --git a/lldb/lit/SymbolFile/PDB/pointers.test b/lldb/test/Shell/SymbolFile/PDB/pointers.test
index a8f84f14783..a8f84f14783 100644
--- a/lldb/lit/SymbolFile/PDB/pointers.test
+++ b/lldb/test/Shell/SymbolFile/PDB/pointers.test
diff --git a/lldb/lit/SymbolFile/PDB/type-quals.test b/lldb/test/Shell/SymbolFile/PDB/type-quals.test
index cf65c79223b..cf65c79223b 100644
--- a/lldb/lit/SymbolFile/PDB/type-quals.test
+++ b/lldb/test/Shell/SymbolFile/PDB/type-quals.test
diff --git a/lldb/lit/SymbolFile/PDB/typedefs.test b/lldb/test/Shell/SymbolFile/PDB/typedefs.test
index 5f70d878230..5f70d878230 100644
--- a/lldb/lit/SymbolFile/PDB/typedefs.test
+++ b/lldb/test/Shell/SymbolFile/PDB/typedefs.test
diff --git a/lldb/lit/SymbolFile/PDB/udt-layout.test b/lldb/test/Shell/SymbolFile/PDB/udt-layout.test
index 726f633efe5..726f633efe5 100644
--- a/lldb/lit/SymbolFile/PDB/udt-layout.test
+++ b/lldb/test/Shell/SymbolFile/PDB/udt-layout.test
diff --git a/lldb/lit/SymbolFile/PDB/variables-locations.test b/lldb/test/Shell/SymbolFile/PDB/variables-locations.test
index b5bfc6fe81a..b5bfc6fe81a 100644
--- a/lldb/lit/SymbolFile/PDB/variables-locations.test
+++ b/lldb/test/Shell/SymbolFile/PDB/variables-locations.test
diff --git a/lldb/lit/SymbolFile/PDB/variables.test b/lldb/test/Shell/SymbolFile/PDB/variables.test
index ae14f02754c..ae14f02754c 100644
--- a/lldb/lit/SymbolFile/PDB/variables.test
+++ b/lldb/test/Shell/SymbolFile/PDB/variables.test
diff --git a/lldb/lit/SymbolFile/PDB/vbases.test b/lldb/test/Shell/SymbolFile/PDB/vbases.test
index 57239e07c87..57239e07c87 100644
--- a/lldb/lit/SymbolFile/PDB/vbases.test
+++ b/lldb/test/Shell/SymbolFile/PDB/vbases.test
diff --git a/lldb/lit/SymbolFile/dissassemble-entry-point.s b/lldb/test/Shell/SymbolFile/dissassemble-entry-point.s
index c8059990237..c8059990237 100644
--- a/lldb/lit/SymbolFile/dissassemble-entry-point.s
+++ b/lldb/test/Shell/SymbolFile/dissassemble-entry-point.s
diff --git a/lldb/lit/SymbolFile/sizeless-symbol.test b/lldb/test/Shell/SymbolFile/sizeless-symbol.test
index 1459d6ada8d..1459d6ada8d 100644
--- a/lldb/lit/SymbolFile/sizeless-symbol.test
+++ b/lldb/test/Shell/SymbolFile/sizeless-symbol.test
diff --git a/lldb/lit/SymbolFile/target-symbols-add-unwind.test b/lldb/test/Shell/SymbolFile/target-symbols-add-unwind.test
index c6542134fcf..c6542134fcf 100644
--- a/lldb/lit/SymbolFile/target-symbols-add-unwind.test
+++ b/lldb/test/Shell/SymbolFile/target-symbols-add-unwind.test
diff --git a/lldb/lit/Unwind/Inputs/call-asm.c b/lldb/test/Shell/Unwind/Inputs/call-asm.c
index b154c1ac138..b154c1ac138 100644
--- a/lldb/lit/Unwind/Inputs/call-asm.c
+++ b/lldb/test/Shell/Unwind/Inputs/call-asm.c
diff --git a/lldb/lit/Unwind/Inputs/eh-frame-dwarf-unwind.s b/lldb/test/Shell/Unwind/Inputs/eh-frame-dwarf-unwind.s
index d83551483dd..d83551483dd 100644
--- a/lldb/lit/Unwind/Inputs/eh-frame-dwarf-unwind.s
+++ b/lldb/test/Shell/Unwind/Inputs/eh-frame-dwarf-unwind.s
diff --git a/lldb/lit/Unwind/Inputs/eh-frame-small-fde.s b/lldb/test/Shell/Unwind/Inputs/eh-frame-small-fde.s
index acc5eaca3fd..acc5eaca3fd 100644
--- a/lldb/lit/Unwind/Inputs/eh-frame-small-fde.s
+++ b/lldb/test/Shell/Unwind/Inputs/eh-frame-small-fde.s
diff --git a/lldb/lit/Unwind/Inputs/prefer-debug-over-eh-frame.s b/lldb/test/Shell/Unwind/Inputs/prefer-debug-over-eh-frame.s
index c9b7a785c34..c9b7a785c34 100644
--- a/lldb/lit/Unwind/Inputs/prefer-debug-over-eh-frame.s
+++ b/lldb/test/Shell/Unwind/Inputs/prefer-debug-over-eh-frame.s
diff --git a/lldb/lit/Unwind/Inputs/trap_frame_sym_ctx.s b/lldb/test/Shell/Unwind/Inputs/trap_frame_sym_ctx.s
index 50ede2d34d3..50ede2d34d3 100644
--- a/lldb/lit/Unwind/Inputs/trap_frame_sym_ctx.s
+++ b/lldb/test/Shell/Unwind/Inputs/trap_frame_sym_ctx.s
diff --git a/lldb/lit/Unwind/Inputs/unwind-plan-dwarf-dump.s b/lldb/test/Shell/Unwind/Inputs/unwind-plan-dwarf-dump.s
index 6030affd09d..6030affd09d 100644
--- a/lldb/lit/Unwind/Inputs/unwind-plan-dwarf-dump.s
+++ b/lldb/test/Shell/Unwind/Inputs/unwind-plan-dwarf-dump.s
diff --git a/lldb/lit/Unwind/eh-frame-dwarf-unwind.test b/lldb/test/Shell/Unwind/eh-frame-dwarf-unwind.test
index 4613b104b96..4613b104b96 100644
--- a/lldb/lit/Unwind/eh-frame-dwarf-unwind.test
+++ b/lldb/test/Shell/Unwind/eh-frame-dwarf-unwind.test
diff --git a/lldb/lit/Unwind/eh-frame-small-fde.test b/lldb/test/Shell/Unwind/eh-frame-small-fde.test
index 368917a063e..368917a063e 100644
--- a/lldb/lit/Unwind/eh-frame-small-fde.test
+++ b/lldb/test/Shell/Unwind/eh-frame-small-fde.test
diff --git a/lldb/lit/Unwind/prefer-debug-over-eh-frame.test b/lldb/test/Shell/Unwind/prefer-debug-over-eh-frame.test
index f023a1e75fa..f023a1e75fa 100644
--- a/lldb/lit/Unwind/prefer-debug-over-eh-frame.test
+++ b/lldb/test/Shell/Unwind/prefer-debug-over-eh-frame.test
diff --git a/lldb/lit/Unwind/trap_frame_sym_ctx.test b/lldb/test/Shell/Unwind/trap_frame_sym_ctx.test
index 10f7892e928..10f7892e928 100644
--- a/lldb/lit/Unwind/trap_frame_sym_ctx.test
+++ b/lldb/test/Shell/Unwind/trap_frame_sym_ctx.test
diff --git a/lldb/lit/Unwind/unwind-plan-dwarf-dump.test b/lldb/test/Shell/Unwind/unwind-plan-dwarf-dump.test
index c378f56b4f6..c378f56b4f6 100644
--- a/lldb/lit/Unwind/unwind-plan-dwarf-dump.test
+++ b/lldb/test/Shell/Unwind/unwind-plan-dwarf-dump.test
diff --git a/lldb/lit/Watchpoint/Inputs/main.cpp b/lldb/test/Shell/Watchpoint/Inputs/main.cpp
index 9bc5724b9c8..9bc5724b9c8 100644
--- a/lldb/lit/Watchpoint/Inputs/main.cpp
+++ b/lldb/test/Shell/Watchpoint/Inputs/main.cpp
diff --git a/lldb/lit/Watchpoint/SetErrorCases.test b/lldb/test/Shell/Watchpoint/SetErrorCases.test
index 39556f98f96..39556f98f96 100644
--- a/lldb/lit/Watchpoint/SetErrorCases.test
+++ b/lldb/test/Shell/Watchpoint/SetErrorCases.test
diff --git a/lldb/lit/helper/__init__.py b/lldb/test/Shell/helper/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/lit/helper/__init__.py
+++ b/lldb/test/Shell/helper/__init__.py
diff --git a/lldb/lit/helper/build.py b/lldb/test/Shell/helper/build.py
index d2cb52f00e5..d2cb52f00e5 100755
--- a/lldb/lit/helper/build.py
+++ b/lldb/test/Shell/helper/build.py
diff --git a/lldb/lit/helper/toolchain.py b/lldb/test/Shell/helper/toolchain.py
index 0290e12c8f5..d9e5c0593ec 100644
--- a/lldb/lit/helper/toolchain.py
+++ b/lldb/test/Shell/helper/toolchain.py
@@ -29,7 +29,7 @@ def use_lldb_substitutions(config):
     if config.llvm_libs_dir:
         build_script_args.append('--libs-dir={0}'.format(config.llvm_libs_dir))
 
-    lldb_init = os.path.join(config.test_exec_root, 'lit-lldb-init')
+    lldb_init = os.path.join(config.test_exec_root, 'Shell', 'lit-lldb-init')
 
     primary_tools = [
         ToolSubst('%lldb',
diff --git a/lldb/lit/lit-lldb-init.in b/lldb/test/Shell/lit-lldb-init.in
index 2c1925c971a..2c1925c971a 100644
--- a/lldb/lit/lit-lldb-init.in
+++ b/lldb/test/Shell/lit-lldb-init.in
diff --git a/lldb/lit/lit.cfg.py b/lldb/test/Shell/lit.cfg.py
index 208338ce95c..3503e956922 100644
--- a/lldb/lit/lit.cfg.py
+++ b/lldb/test/Shell/lit.cfg.py
@@ -17,7 +17,7 @@ site.addsitedir(os.path.dirname(__file__))
 from helper import toolchain
 
 # name: The name of this test suite.
-config.name = 'LLDB'
+config.name = 'lldb-shell'
 
 # testFormat: The test format to use to interpret tests.
 config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
@@ -35,7 +35,7 @@ config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt']
 config.test_source_root = os.path.dirname(__file__)
 
 # test_exec_root: The root path where tests should be run.
-config.test_exec_root = os.path.join(config.lldb_obj_root, 'lit')
+config.test_exec_root = os.path.join(config.lldb_obj_root, 'test')
 
 
 llvm_config.use_default_substitutions()
diff --git a/lldb/lit/lit.site.cfg.py.in b/lldb/test/Shell/lit.site.cfg.py.in
index c9b6e09cc0e..459d5604541 100644
--- a/lldb/lit/lit.site.cfg.py.in
+++ b/lldb/test/Shell/lit.site.cfg.py.in
@@ -41,4 +41,4 @@ import lit.llvm
 lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
-lit_config.load_config(config, "@LLDB_SOURCE_DIR@/lit/lit.cfg.py")
+lit_config.load_config(config, "@LLDB_SOURCE_DIR@/test/Shell/lit.cfg.py")
diff --git a/lldb/test/Unit/README.md b/lldb/test/Unit/README.md
new file mode 100644
index 00000000000..0302747acd9
--- /dev/null
+++ b/lldb/test/Unit/README.md
@@ -0,0 +1,4 @@
+# LLDB Unit Tests
+
+This directory only exists for the lit test driver. The actual tests live in
+the `unittest` directory in top level LLDB directory.
diff --git a/lldb/lit/Unit/lit.cfg.py b/lldb/test/Unit/lit.cfg.py
index 3633c73a1d4..e53bcd394ca 100644
--- a/lldb/lit/Unit/lit.cfg.py
+++ b/lldb/test/Unit/lit.cfg.py
@@ -9,7 +9,7 @@ import lit.formats
 from lit.llvm import llvm_config
 
 # name: The name of this test suite.
-config.name = 'lldb-Unit'
+config.name = 'lldb-unit'
 
 # suffixes: A list of file extensions to treat as test files.
 config.suffixes =  []
diff --git a/lldb/test/Unit/lit.site.cfg.py.in b/lldb/test/Unit/lit.site.cfg.py.in
new file mode 100644
index 00000000000..9d9bcd4ba62
--- /dev/null
+++ b/lldb/test/Unit/lit.site.cfg.py.in
@@ -0,0 +1,29 @@
+@LIT_SITE_CFG_IN_HEADER@
+
+config.test_exec_root = "@LLDB_BINARY_DIR@"
+config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+config.llvm_obj_root = "@LLVM_BINARY_DIR@"
+config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
+config.llvm_build_mode = "@LLVM_BUILD_MODE@"
+config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
+config.lldb_obj_root = "@LLDB_BINARY_DIR@"
+config.lldb_src_root = "@LLDB_SOURCE_DIR@"
+config.target_triple = "@TARGET_TRIPLE@"
+config.python_executable = "@PYTHON_EXECUTABLE@"
+
+# Support substitution of the tools and libs dirs with user parameters. This is
+# used when we can't determine the tool dir at configuration time.
+try:
+    config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
+    config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
+    config.llvm_build_mode = config.llvm_build_mode % lit_config.params
+except KeyError as e:
+    key, = e.args
+    lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
+
+import lit.llvm
+lit.llvm.initialize(lit_config, config)
+
+# Let the main config do the real work.
+lit_config.load_config(config, "@LLDB_SOURCE_DIR@/test/Unit/lit.cfg.py")
diff --git a/lldb/test/lit.cfg.py b/lldb/test/lit.cfg.py
new file mode 100644
index 00000000000..797750bac21
--- /dev/null
+++ b/lldb/test/lit.cfg.py
@@ -0,0 +1,41 @@
+# -*- Python -*-
+
+import os
+import platform
+import re
+import shutil
+import site
+import sys
+
+import lit.formats
+from lit.llvm import llvm_config
+from lit.llvm.subst import FindTool
+from lit.llvm.subst import ToolSubst
+from distutils.spawn import find_executable
+
+# This is the top level configuration. Most of these configuration options will
+# be overriden by individual lit configuration files in the test
+# subdirectories.
+
+# name: The name of this test suite.
+config.name = 'lldb'
+
+# testFormat: The test format to use to interpret tests.
+config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
+
+# suffixes: A list of file extensions to treat as test files. This is overriden
+# by individual lit.local.cfg files in the test subdirectories.
+config.suffixes = ['.test', '.cpp', '.s']
+
+# excludes: A list of directories to exclude from the testsuite. The 'Inputs'
+# subdirectories contain auxiliary inputs for various tests in their parent
+# directories.
+config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt']
+
+# test_source_root: The root path where tests are located.
+config.test_source_root = os.path.dirname(__file__)
+
+# test_exec_root: The root path where tests should be run.
+config.test_exec_root = os.path.join(config.lldb_obj_root, 'test')
+
+llvm_config.use_default_substitutions()
diff --git a/lldb/lit/Unit/lit.site.cfg.py.in b/lldb/test/lit.site.cfg.py.in
index 0c629fdfaa5..49d789d42d9 100644
--- a/lldb/lit/Unit/lit.site.cfg.py.in
+++ b/lldb/test/lit.site.cfg.py.in
@@ -26,4 +26,4 @@ import lit.llvm
 lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
-lit_config.load_config(config, "@LLDB_SOURCE_DIR@/lit/Unit/lit.cfg.py")
+lit_config.load_config(config, "@LLDB_SOURCE_DIR@/test/lit.cfg.py")