diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -185,7 +185,6 @@ 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 --- 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/CMakeLists.txt b/lldb/test/API/CMakeLists.txt copy from lldb/test/CMakeLists.txt copy to lldb/test/API/CMakeLists.txt diff --git a/lldb/test/API/README.md b/lldb/test/API/README.md new file mode 100644 --- /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 rename from lldb/test/dotest.py rename to lldb/test/API/dotest.py diff --git a/lldb/lit/Suite/lit.cfg b/lldb/test/API/lit.cfg rename from lldb/lit/Suite/lit.cfg rename to lldb/test/API/lit.cfg --- a/lldb/lit/Suite/lit.cfg +++ b/lldb/test/API/lit.cfg @@ -9,7 +9,7 @@ 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 @@ 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 rename from lldb/lit/Suite/lit.site.cfg.in rename to lldb/test/API/lit.site.cfg.in --- a/lldb/lit/Suite/lit.site.cfg.in +++ b/lldb/test/API/lit.site.cfg.in @@ -20,7 +20,7 @@ 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 @@ 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 rename from lldb/lit/Suite/lldbtest.py rename to lldb/test/API/lldbtest.py diff --git a/lldb/test/testcases b/lldb/test/API/testcases rename from lldb/test/testcases rename to lldb/test/API/testcases diff --git a/lldb/test/use_lldb_suite.py b/lldb/test/API/use_lldb_suite.py rename from lldb/test/use_lldb_suite.py rename to lldb/test/API/use_lldb_suite.py diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -1,149 +1,117 @@ -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") +# 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_HIDE_CONSOLE_WINDOWS - 1 - CACHE BOOL "(Windows only) Hides the console window for an inferior when it is launched through the test suite") +add_subdirectory(API) - 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() +# 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 (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows|Darwin") - list(APPEND LLDB_TEST_COMMON_ARGS - --env ARCHIVER=${CMAKE_AR} --env OBJCOPY=${CMAKE_OBJCOPY}) +if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set(LLDB_IS_64_BITS 1) 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.") +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(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() +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(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() +if(TARGET lld) + add_lldb_test_dependency(lld) endif() -set(LLDB_DOTEST_ARGS ${LLDB_TEST_COMMON_ARGS};${LLDB_TEST_USER_ARGS}) -set_property(GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY ${LLDB_DOTEST_ARGS}) +# 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_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() -add_custom_target(check-lldb) -add_dependencies(check-lldb lldb-test-deps) -set_target_properties(check-lldb PROPERTIES FOLDER "lldb misc") +add_lit_testsuite(check-lldb-lit "Running lldb lit test suite" + ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS lldb-test-deps + ) -# 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 () +set_target_properties(check-lldb-lit PROPERTIES FOLDER "lldb tests") -# Run the lit-style tests and the unittests as part of the check-lldb target. -add_dependencies(check-lldb check-lldb-lit) +# 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() -# 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}) +add_lit_testsuites(LLDB + ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS lldb-test-deps + ) diff --git a/lldb/lit/Breakpoint/Inputs/case-sensitive.c b/lldb/test/Shell/Breakpoint/Inputs/case-sensitive.c rename from lldb/lit/Breakpoint/Inputs/case-sensitive.c rename to 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 rename from lldb/lit/Breakpoint/Inputs/debug_addrx.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/debug_rnglist_basic.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/debug_rnglist_offset_pair.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/debug_rnglist_rlestartend.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/debug_rnglistx_rlex.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/implicit_const_form_support.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/jitbp.cpp rename to 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 rename from lldb/lit/Breakpoint/Inputs/ppc64-localentry.s rename to 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 rename from lldb/lit/Breakpoint/Inputs/single-file-split-dwarf.o.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/single-file-split-dwarf.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml rename to 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 rename from lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-main.yaml rename to 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 rename from lldb/lit/Breakpoint/case-insensitive.test rename to lldb/test/Shell/Breakpoint/case-insensitive.test diff --git a/lldb/lit/Breakpoint/case-sensitive.test b/lldb/test/Shell/Breakpoint/case-sensitive.test rename from lldb/lit/Breakpoint/case-sensitive.test rename to lldb/test/Shell/Breakpoint/case-sensitive.test diff --git a/lldb/lit/Breakpoint/debug_addrx.test b/lldb/test/Shell/Breakpoint/debug_addrx.test rename from lldb/lit/Breakpoint/debug_addrx.test rename to 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 rename from lldb/lit/Breakpoint/debug_rnglist_basic.test rename to 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 rename from lldb/lit/Breakpoint/debug_rnglist_offset_pair.test rename to 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 rename from lldb/lit/Breakpoint/debug_rnglist_rlestartend.test rename to 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 rename from lldb/lit/Breakpoint/debug_rnglistx_rlex.test rename to 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 rename from lldb/lit/Breakpoint/implicit_const_form_support.test rename to 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 rename from lldb/lit/Breakpoint/jitbp_elf.test rename to lldb/test/Shell/Breakpoint/jitbp_elf.test diff --git a/lldb/lit/Breakpoint/ppc64-localentry.test b/lldb/test/Shell/Breakpoint/ppc64-localentry.test rename from lldb/lit/Breakpoint/ppc64-localentry.test rename to 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 rename from lldb/lit/Breakpoint/single-file-split-dwarf.test rename to 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 rename from lldb/lit/Breakpoint/split-dwarf-5-addrbase.test rename to 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 rename from lldb/lit/Breakpoint/split-dwarf5-debug-stroffsets.test rename to 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 rename from lldb/lit/BuildScript/compiler-full-path.test rename to lldb/test/Shell/BuildScript/compiler-full-path.test diff --git a/lldb/lit/BuildScript/modes.test b/lldb/test/Shell/BuildScript/modes.test rename from lldb/lit/BuildScript/modes.test rename to lldb/test/Shell/BuildScript/modes.test diff --git a/lldb/lit/BuildScript/script-args.test b/lldb/test/Shell/BuildScript/script-args.test rename from lldb/lit/BuildScript/script-args.test rename to 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 rename from lldb/lit/BuildScript/toolchain-clang-cl.test rename to 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 rename from lldb/lit/BuildScript/toolchain-clang.test rename to lldb/test/Shell/BuildScript/toolchain-clang.test diff --git a/lldb/lit/BuildScript/toolchain-msvc.test b/lldb/test/Shell/BuildScript/toolchain-msvc.test rename from lldb/lit/BuildScript/toolchain-msvc.test rename to lldb/test/Shell/BuildScript/toolchain-msvc.test diff --git a/lldb/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test rename from lldb/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test rename to lldb/test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test diff --git a/lldb/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test rename from lldb/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test rename to 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 rename from lldb/lit/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py rename to 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 rename from lldb/lit/Commands/CommandScriptImmediateOutput/lit.local.cfg rename to 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 rename from lldb/lit/Commands/Inputs/frame.py rename to lldb/test/Shell/Commands/Inputs/frame.py diff --git a/lldb/lit/Commands/Inputs/main.c b/lldb/test/Shell/Commands/Inputs/main.c rename from lldb/lit/Commands/Inputs/main.c rename to lldb/test/Shell/Commands/Inputs/main.c diff --git a/lldb/lit/Commands/command-backtrace.test b/lldb/test/Shell/Commands/command-backtrace.test rename from lldb/lit/Commands/command-backtrace.test rename to 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 rename from lldb/lit/Commands/command-regex-delete.test rename to 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 rename from lldb/lit/Commands/command-regex-unalias.test rename to 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 rename from lldb/lit/Commands/command-script-import.test rename to 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 rename from lldb/lit/Commands/command-source.test rename to lldb/test/Shell/Commands/command-source.test diff --git a/lldb/lit/Driver/Inputs/.lldbinit b/lldb/test/Shell/Driver/Inputs/.lldbinit rename from lldb/lit/Driver/Inputs/.lldbinit rename to lldb/test/Shell/Driver/Inputs/.lldbinit diff --git a/lldb/lit/Driver/Inputs/Print0.in b/lldb/test/Shell/Driver/Inputs/Print0.in rename from lldb/lit/Driver/Inputs/Print0.in rename to lldb/test/Shell/Driver/Inputs/Print0.in diff --git a/lldb/lit/Driver/Inputs/Print2.in b/lldb/test/Shell/Driver/Inputs/Print2.in rename from lldb/lit/Driver/Inputs/Print2.in rename to lldb/test/Shell/Driver/Inputs/Print2.in diff --git a/lldb/lit/Driver/Inputs/Print4.in b/lldb/test/Shell/Driver/Inputs/Print4.in rename from lldb/lit/Driver/Inputs/Print4.in rename to lldb/test/Shell/Driver/Inputs/Print4.in diff --git a/lldb/lit/Driver/Inputs/Print6.in b/lldb/test/Shell/Driver/Inputs/Print6.in rename from lldb/lit/Driver/Inputs/Print6.in rename to lldb/test/Shell/Driver/Inputs/Print6.in diff --git a/lldb/lit/Driver/Inputs/convenience.in b/lldb/test/Shell/Driver/Inputs/convenience.in rename from lldb/lit/Driver/Inputs/convenience.in rename to lldb/test/Shell/Driver/Inputs/convenience.in diff --git a/lldb/lit/Driver/Inputs/hello.c b/lldb/test/Shell/Driver/Inputs/hello.c rename from lldb/lit/Driver/Inputs/hello.c rename to lldb/test/Shell/Driver/Inputs/hello.c diff --git a/lldb/lit/Driver/Inputs/hello.cpp b/lldb/test/Shell/Driver/Inputs/hello.cpp rename from lldb/lit/Driver/Inputs/hello.cpp rename to 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 rename from lldb/lit/Driver/Inputs/process_attach_pid.in rename to 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 rename from lldb/lit/Driver/Inputs/syntax_error.py rename to lldb/test/Shell/Driver/Inputs/syntax_error.py diff --git a/lldb/lit/Driver/LocalLLDBInit.test b/lldb/test/Shell/Driver/LocalLLDBInit.test rename from lldb/lit/Driver/LocalLLDBInit.test rename to lldb/test/Shell/Driver/LocalLLDBInit.test diff --git a/lldb/lit/Driver/TestCommands.test b/lldb/test/Shell/Driver/TestCommands.test rename from lldb/lit/Driver/TestCommands.test rename to lldb/test/Shell/Driver/TestCommands.test diff --git a/lldb/lit/Driver/TestConvenienceVariables.test b/lldb/test/Shell/Driver/TestConvenienceVariables.test rename from lldb/lit/Driver/TestConvenienceVariables.test rename to lldb/test/Shell/Driver/TestConvenienceVariables.test diff --git a/lldb/lit/Driver/TestCore.test b/lldb/test/Shell/Driver/TestCore.test rename from lldb/lit/Driver/TestCore.test rename to lldb/test/Shell/Driver/TestCore.test diff --git a/lldb/lit/Driver/TestFile.test b/lldb/test/Shell/Driver/TestFile.test rename from lldb/lit/Driver/TestFile.test rename to lldb/test/Shell/Driver/TestFile.test diff --git a/lldb/lit/Driver/TestNoUseColor.test b/lldb/test/Shell/Driver/TestNoUseColor.test rename from lldb/lit/Driver/TestNoUseColor.test rename to lldb/test/Shell/Driver/TestNoUseColor.test diff --git a/lldb/lit/Driver/TestProcessAttach.test b/lldb/test/Shell/Driver/TestProcessAttach.test rename from lldb/lit/Driver/TestProcessAttach.test rename to lldb/test/Shell/Driver/TestProcessAttach.test diff --git a/lldb/lit/Driver/TestRepl.test b/lldb/test/Shell/Driver/TestRepl.test rename from lldb/lit/Driver/TestRepl.test rename to lldb/test/Shell/Driver/TestRepl.test diff --git a/lldb/lit/Driver/TestSingleQuote.test b/lldb/test/Shell/Driver/TestSingleQuote.test rename from lldb/lit/Driver/TestSingleQuote.test rename to lldb/test/Shell/Driver/TestSingleQuote.test diff --git a/lldb/lit/Driver/TestTarget.test b/lldb/test/Shell/Driver/TestTarget.test rename from lldb/lit/Driver/TestTarget.test rename to 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 rename from lldb/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit rename to 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 rename from lldb/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit rename to 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 rename from lldb/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit rename to 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 rename from lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit rename to 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 rename from lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit rename to 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 rename from lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads.cpp rename to 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 rename from lldb/lit/ExecControl/StopHook/Inputs/stop-hook.c rename to 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 rename from lldb/lit/ExecControl/StopHook/stop-hook-threads.test rename to 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 rename from lldb/lit/ExecControl/StopHook/stop-hook.test rename to 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 rename from lldb/lit/Expr/Inputs/call-function.cpp rename to 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 rename from lldb/lit/Expr/Inputs/ir-memory-map-basic rename to 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 rename from lldb/lit/Expr/Inputs/ir-memory-map-mix-malloc-free rename to 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 rename from lldb/lit/Expr/Inputs/ir-memory-map-overlap1 rename to lldb/test/Shell/Expr/Inputs/ir-memory-map-overlap1 diff --git a/lldb/lit/Expr/TestIRMemoryMap.test b/lldb/test/Shell/Expr/TestIRMemoryMap.test rename from lldb/lit/Expr/TestIRMemoryMap.test rename to lldb/test/Shell/Expr/TestIRMemoryMap.test diff --git a/lldb/lit/Expr/TestIRMemoryMapWindows.test b/lldb/test/Shell/Expr/TestIRMemoryMapWindows.test rename from lldb/lit/Expr/TestIRMemoryMapWindows.test rename to lldb/test/Shell/Expr/TestIRMemoryMapWindows.test diff --git a/lldb/lit/Expr/TestMultilineExpr.test b/lldb/test/Shell/Expr/TestMultilineExpr.test rename from lldb/lit/Expr/TestMultilineExpr.test rename to lldb/test/Shell/Expr/TestMultilineExpr.test diff --git a/lldb/lit/Expr/TestTypeOfDeclTypeExpr.test b/lldb/test/Shell/Expr/TestTypeOfDeclTypeExpr.test rename from lldb/lit/Expr/TestTypeOfDeclTypeExpr.test rename to lldb/test/Shell/Expr/TestTypeOfDeclTypeExpr.test diff --git a/lldb/lit/Heap/Inputs/cstr.c b/lldb/test/Shell/Heap/Inputs/cstr.c rename from lldb/lit/Heap/Inputs/cstr.c rename to lldb/test/Shell/Heap/Inputs/cstr.c diff --git a/lldb/lit/Heap/heap-cstr.test b/lldb/test/Shell/Heap/heap-cstr.test rename from lldb/lit/Heap/heap-cstr.test rename to lldb/test/Shell/Heap/heap-cstr.test diff --git a/lldb/lit/Host/Inputs/simple.c b/lldb/test/Shell/Host/Inputs/simple.c rename from lldb/lit/Host/Inputs/simple.c rename to lldb/test/Shell/Host/Inputs/simple.c diff --git a/lldb/lit/Host/TestCustomShell.test b/lldb/test/Shell/Host/TestCustomShell.test rename from lldb/lit/Host/TestCustomShell.test rename to 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 rename from lldb/lit/Minidump/Inputs/linux-x86_64.syms rename to 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 rename from lldb/lit/Minidump/Inputs/linux-x86_64.yaml rename to 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 rename from lldb/lit/Minidump/Windows/Inputs/find-module.dmp.yaml rename to 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 rename from lldb/lit/Minidump/Windows/Inputs/find-module.exe.yaml rename to 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 rename from lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.cpp rename to 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 rename from lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp rename to 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 rename from lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.lldbinit rename to 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 rename from lldb/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb rename to 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 rename from lldb/lit/Minidump/Windows/Sigsegv/sigsegv.test rename to 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 rename from lldb/lit/Minidump/Windows/find-module.test rename to 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 rename from lldb/lit/Minidump/breakpad-symbols.test rename to 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 rename from lldb/lit/Minidump/disassemble-no-module.yaml rename to 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 rename from lldb/lit/Minidump/dump-all.test rename to lldb/test/Shell/Minidump/dump-all.test diff --git a/lldb/lit/Minidump/fb-dump.test b/lldb/test/Shell/Minidump/fb-dump.test rename from lldb/lit/Minidump/fb-dump.test rename to lldb/test/Shell/Minidump/fb-dump.test diff --git a/lldb/lit/Minidump/lit.local.cfg b/lldb/test/Shell/Minidump/lit.local.cfg rename from lldb/lit/Minidump/lit.local.cfg rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/identification-linux.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/identification-macosx.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/identification-windows.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/sections.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms rename to 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 rename from lldb/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml rename to 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 rename from lldb/lit/ObjectFile/Breakpad/breakpad-identification.test rename to 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 rename from lldb/lit/ObjectFile/Breakpad/discontiguous-sections.test rename to 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 rename from lldb/lit/ObjectFile/Breakpad/lit.local.cfg rename to 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 rename from lldb/lit/ObjectFile/Breakpad/sections-trailing-func.test rename to 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 rename from lldb/lit/ObjectFile/Breakpad/sections.test rename to 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 rename from lldb/lit/ObjectFile/Breakpad/uuid-matching-mac.test rename to 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 rename from lldb/lit/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf rename to 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 rename from lldb/lit/ObjectFile/ELF/Inputs/minidebuginfo-main.c rename to 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 rename from lldb/lit/ObjectFile/ELF/Inputs/netbsd-amd64.core rename to 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 rename from lldb/lit/ObjectFile/ELF/PT_LOAD-empty.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/PT_LOAD-overlap-section.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/PT_LOAD-overlap.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/PT_LOAD.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/aarch64-relocations.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/base-address.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/basic-info.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/build-id-case.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/compressed-sections.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/duplicate-section.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/gnu-debuglink.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/many-sections.s rename to 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 rename from lldb/lit/ObjectFile/ELF/minidebuginfo-corrupt-xz.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/minidebuginfo-find-symbols.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/minidebuginfo-no-lzma.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test rename to 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 rename from lldb/lit/ObjectFile/ELF/netbsd-core-amd64.test rename to 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 rename from lldb/lit/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/section-addresses.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/section-overlap.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/section-permissions.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/section-types-edgecases.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/section-types.yaml rename to 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 rename from lldb/lit/ObjectFile/ELF/short-build-id.yaml rename to 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 rename from lldb/lit/ObjectFile/MachO/lc_build_version.yaml rename to 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 rename from lldb/lit/ObjectFile/MachO/lc_build_version_notools.yaml rename to 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 rename from lldb/lit/ObjectFile/MachO/lc_version_min.yaml rename to 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 rename from lldb/lit/ObjectFile/MachO/subsections.yaml rename to lldb/test/Shell/ObjectFile/MachO/subsections.yaml diff --git a/lldb/lit/ObjectFile/MachO/symtab.yaml b/lldb/test/Shell/ObjectFile/MachO/symtab.yaml rename from lldb/lit/ObjectFile/MachO/symtab.yaml rename to 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 rename from lldb/lit/ObjectFile/PECOFF/basic-info-arm.yaml rename to 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 rename from lldb/lit/ObjectFile/PECOFF/basic-info-arm64.yaml rename to 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 rename from lldb/lit/ObjectFile/PECOFF/basic-info.yaml rename to 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 rename from lldb/lit/ObjectFile/PECOFF/dep-modules.yaml rename to 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 rename from lldb/lit/ObjectFile/PECOFF/export-dllfunc.yaml rename to 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 rename from lldb/lit/ObjectFile/PECOFF/lit.local.cfg rename to 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 rename from lldb/lit/ObjectFile/PECOFF/sections-names.yaml rename to 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 rename from lldb/lit/ObjectFile/PECOFF/subsections.yaml rename to lldb/test/Shell/ObjectFile/PECOFF/subsections.yaml diff --git a/lldb/lit/ObjectFile/PECOFF/uuid.yaml b/lldb/test/Shell/ObjectFile/PECOFF/uuid.yaml rename from lldb/lit/ObjectFile/PECOFF/uuid.yaml rename to lldb/test/Shell/ObjectFile/PECOFF/uuid.yaml diff --git a/lldb/lit/ObjectFile/lit.local.cfg b/lldb/test/Shell/ObjectFile/lit.local.cfg rename from lldb/lit/ObjectFile/lit.local.cfg rename to lldb/test/Shell/ObjectFile/lit.local.cfg diff --git a/lldb/lit/Process/Inputs/env.cpp b/lldb/test/Shell/Process/Inputs/env.cpp rename from lldb/lit/Process/Inputs/env.cpp rename to lldb/test/Shell/Process/Inputs/env.cpp diff --git a/lldb/lit/Process/TestEnvironment.test b/lldb/test/Shell/Process/TestEnvironment.test rename from lldb/lit/Process/TestEnvironment.test rename to 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 rename from lldb/lit/Process/Windows/exception_access_violation.cpp rename to lldb/test/Shell/Process/Windows/exception_access_violation.cpp diff --git a/lldb/lit/Python/crashlog.test b/lldb/test/Shell/Python/crashlog.test rename from lldb/lit/Python/crashlog.test rename to lldb/test/Shell/Python/crashlog.test --- 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 @@ # 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 rename from lldb/lit/Quit/TestQuitExitCode-30.test rename to lldb/test/Shell/Quit/TestQuitExitCode-30.test diff --git a/lldb/lit/Quit/TestQuitExitCode0.test b/lldb/test/Shell/Quit/TestQuitExitCode0.test rename from lldb/lit/Quit/TestQuitExitCode0.test rename to lldb/test/Shell/Quit/TestQuitExitCode0.test diff --git a/lldb/lit/Quit/TestQuitExitCode30.test b/lldb/test/Shell/Quit/TestQuitExitCode30.test rename from lldb/lit/Quit/TestQuitExitCode30.test rename to lldb/test/Shell/Quit/TestQuitExitCode30.test diff --git a/lldb/lit/Quit/TestQuitExitCodeHex0.test b/lldb/test/Shell/Quit/TestQuitExitCodeHex0.test rename from lldb/lit/Quit/TestQuitExitCodeHex0.test rename to lldb/test/Shell/Quit/TestQuitExitCodeHex0.test diff --git a/lldb/lit/Quit/TestQuitExitCodeHexA.test b/lldb/test/Shell/Quit/TestQuitExitCodeHexA.test rename from lldb/lit/Quit/TestQuitExitCodeHexA.test rename to lldb/test/Shell/Quit/TestQuitExitCodeHexA.test diff --git a/lldb/lit/Quit/TestQuitExitCodeImplicit0.test b/lldb/test/Shell/Quit/TestQuitExitCodeImplicit0.test rename from lldb/lit/Quit/TestQuitExitCodeImplicit0.test rename to lldb/test/Shell/Quit/TestQuitExitCodeImplicit0.test diff --git a/lldb/lit/Quit/TestQuitExitCodeNonInt.test b/lldb/test/Shell/Quit/TestQuitExitCodeNonInt.test rename from lldb/lit/Quit/TestQuitExitCodeNonInt.test rename to lldb/test/Shell/Quit/TestQuitExitCodeNonInt.test diff --git a/lldb/lit/Quit/TestQuitExitCodeTooManyArgs.test b/lldb/test/Shell/Quit/TestQuitExitCodeTooManyArgs.test rename from lldb/lit/Quit/TestQuitExitCodeTooManyArgs.test rename to 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 rename from lldb/lit/Quit/expect_exit_code.py rename to 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 rename from lldb/lit/Register/Inputs/x86-64-gp-read.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-64-gp-write.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-64-read.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-64-write.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-gp-read.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-gp-write.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-mm-xmm-read.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-mm-xmm-write.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-ymm-read.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-ymm-write.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-zmm-read.cpp rename to 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 rename from lldb/lit/Register/Inputs/x86-zmm-write.cpp rename to 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 rename from lldb/lit/Register/x86-64-gp-read.test rename to 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 rename from lldb/lit/Register/x86-64-gp-write.test rename to 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 rename from lldb/lit/Register/x86-64-read.test rename to 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 rename from lldb/lit/Register/x86-64-write.test rename to 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 rename from lldb/lit/Register/x86-64-xmm16-read.test rename to 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 rename from lldb/lit/Register/x86-64-xmm16-write.test rename to 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 rename from lldb/lit/Register/x86-64-ymm-read.test rename to 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 rename from lldb/lit/Register/x86-64-ymm-write.test rename to 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 rename from lldb/lit/Register/x86-64-ymm16-read.test rename to 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 rename from lldb/lit/Register/x86-64-ymm16-write.test rename to 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 rename from lldb/lit/Register/x86-64-zmm-read.test rename to 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 rename from lldb/lit/Register/x86-64-zmm-write.test rename to 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 rename from lldb/lit/Register/x86-gp-read.test rename to 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 rename from lldb/lit/Register/x86-gp-write.test rename to 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 rename from lldb/lit/Register/x86-mm-xmm-read.test rename to 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 rename from lldb/lit/Register/x86-mm-xmm-write.test rename to 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 rename from lldb/lit/Register/x86-ymm-read.test rename to 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 rename from lldb/lit/Register/x86-ymm-write.test rename to 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 rename from lldb/lit/Register/x86-zmm-read.test rename to 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 rename from lldb/lit/Register/x86-zmm-write.test rename to 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 rename from lldb/lit/Reproducer/Functionalities/Inputs/DataFormatter.in rename to 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 rename from lldb/lit/Reproducer/Functionalities/Inputs/foo.cpp rename to 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 rename from lldb/lit/Reproducer/Functionalities/Inputs/stepping.c rename to 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 rename from lldb/lit/Reproducer/Functionalities/TestDataFormatter.test rename to lldb/test/Shell/Reproducer/Functionalities/TestDataFormatter.test diff --git a/lldb/lit/Reproducer/Functionalities/TestImageList.test b/lldb/test/Shell/Reproducer/Functionalities/TestImageList.test rename from lldb/lit/Reproducer/Functionalities/TestImageList.test rename to lldb/test/Shell/Reproducer/Functionalities/TestImageList.test diff --git a/lldb/lit/Reproducer/Functionalities/TestStepping.test b/lldb/test/Shell/Reproducer/Functionalities/TestStepping.test rename from lldb/lit/Reproducer/Functionalities/TestStepping.test rename to lldb/test/Shell/Reproducer/Functionalities/TestStepping.test diff --git a/lldb/lit/Reproducer/Inputs/FileCapture.in b/lldb/test/Shell/Reproducer/Inputs/FileCapture.in rename from lldb/lit/Reproducer/Inputs/FileCapture.in rename to lldb/test/Shell/Reproducer/Inputs/FileCapture.in diff --git a/lldb/lit/Reproducer/Inputs/GDBRemoteCapture.in b/lldb/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in rename from lldb/lit/Reproducer/Inputs/GDBRemoteCapture.in rename to lldb/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in diff --git a/lldb/lit/Reproducer/Inputs/simple.c b/lldb/test/Shell/Reproducer/Inputs/simple.c rename from lldb/lit/Reproducer/Inputs/simple.c rename to 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 rename from lldb/lit/Reproducer/Modules/Inputs/Bar.h rename to 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 rename from lldb/lit/Reproducer/Modules/Inputs/Foo.h rename to 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 rename from lldb/lit/Reproducer/Modules/Inputs/ModuleCXX.in rename to 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 rename from lldb/lit/Reproducer/Modules/Inputs/main.cpp rename to 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 rename from lldb/lit/Reproducer/Modules/Inputs/module.modulemap rename to 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 rename from lldb/lit/Reproducer/Modules/TestModuleCXX.test rename to lldb/test/Shell/Reproducer/Modules/TestModuleCXX.test diff --git a/lldb/lit/Reproducer/TestDriverOptions.test b/lldb/test/Shell/Reproducer/TestDriverOptions.test rename from lldb/lit/Reproducer/TestDriverOptions.test rename to lldb/test/Shell/Reproducer/TestDriverOptions.test diff --git a/lldb/lit/Reproducer/TestDump.test b/lldb/test/Shell/Reproducer/TestDump.test rename from lldb/lit/Reproducer/TestDump.test rename to lldb/test/Shell/Reproducer/TestDump.test diff --git a/lldb/lit/Reproducer/TestFileRepro.test b/lldb/test/Shell/Reproducer/TestFileRepro.test rename from lldb/lit/Reproducer/TestFileRepro.test rename to lldb/test/Shell/Reproducer/TestFileRepro.test diff --git a/lldb/lit/Reproducer/TestGDBRemoteRepro.test b/lldb/test/Shell/Reproducer/TestGDBRemoteRepro.test rename from lldb/lit/Reproducer/TestGDBRemoteRepro.test rename to lldb/test/Shell/Reproducer/TestGDBRemoteRepro.test diff --git a/lldb/lit/Reproducer/TestRelativePath.test b/lldb/test/Shell/Reproducer/TestRelativePath.test rename from lldb/lit/Reproducer/TestRelativePath.test rename to lldb/test/Shell/Reproducer/TestRelativePath.test diff --git a/lldb/lit/Reproducer/TestReuseDirectory.test b/lldb/test/Shell/Reproducer/TestReuseDirectory.test rename from lldb/lit/Reproducer/TestReuseDirectory.test rename to lldb/test/Shell/Reproducer/TestReuseDirectory.test diff --git a/lldb/lit/Reproducer/TestSynchronous.test b/lldb/test/Shell/Reproducer/TestSynchronous.test rename from lldb/lit/Reproducer/TestSynchronous.test rename to lldb/test/Shell/Reproducer/TestSynchronous.test diff --git a/lldb/lit/Settings/Inputs/DontStopCommandSource.in b/lldb/test/Shell/Settings/Inputs/DontStopCommandSource.in rename from lldb/lit/Settings/Inputs/DontStopCommandSource.in rename to lldb/test/Shell/Settings/Inputs/DontStopCommandSource.in diff --git a/lldb/lit/Settings/Inputs/EchoCommandsAll.out b/lldb/test/Shell/Settings/Inputs/EchoCommandsAll.out rename from lldb/lit/Settings/Inputs/EchoCommandsAll.out rename to lldb/test/Shell/Settings/Inputs/EchoCommandsAll.out diff --git a/lldb/lit/Settings/Inputs/EchoCommandsNoComments.out b/lldb/test/Shell/Settings/Inputs/EchoCommandsNoComments.out rename from lldb/lit/Settings/Inputs/EchoCommandsNoComments.out rename to lldb/test/Shell/Settings/Inputs/EchoCommandsNoComments.out diff --git a/lldb/lit/Settings/Inputs/EchoCommandsNone.out b/lldb/test/Shell/Settings/Inputs/EchoCommandsNone.out rename from lldb/lit/Settings/Inputs/EchoCommandsNone.out rename to lldb/test/Shell/Settings/Inputs/EchoCommandsNone.out diff --git a/lldb/lit/Settings/Inputs/EchoCommandsQuiet.out b/lldb/test/Shell/Settings/Inputs/EchoCommandsQuiet.out rename from lldb/lit/Settings/Inputs/EchoCommandsQuiet.out rename to lldb/test/Shell/Settings/Inputs/EchoCommandsQuiet.out diff --git a/lldb/lit/Settings/Inputs/EchoCommandsTest.in b/lldb/test/Shell/Settings/Inputs/EchoCommandsTest.in rename from lldb/lit/Settings/Inputs/EchoCommandsTest.in rename to lldb/test/Shell/Settings/Inputs/EchoCommandsTest.in diff --git a/lldb/lit/Settings/Inputs/StopCommandSource.in b/lldb/test/Shell/Settings/Inputs/StopCommandSource.in rename from lldb/lit/Settings/Inputs/StopCommandSource.in rename to lldb/test/Shell/Settings/Inputs/StopCommandSource.in diff --git a/lldb/lit/Settings/Inputs/main.c b/lldb/test/Shell/Settings/Inputs/main.c rename from lldb/lit/Settings/Inputs/main.c rename to lldb/test/Shell/Settings/Inputs/main.c diff --git a/lldb/lit/Settings/TestDisableColor.test b/lldb/test/Shell/Settings/TestDisableColor.test rename from lldb/lit/Settings/TestDisableColor.test rename to lldb/test/Shell/Settings/TestDisableColor.test diff --git a/lldb/lit/Settings/TestDisassemblyFormat.test b/lldb/test/Shell/Settings/TestDisassemblyFormat.test rename from lldb/lit/Settings/TestDisassemblyFormat.test rename to lldb/test/Shell/Settings/TestDisassemblyFormat.test diff --git a/lldb/lit/Settings/TestEchoCommands.test b/lldb/test/Shell/Settings/TestEchoCommands.test rename from lldb/lit/Settings/TestEchoCommands.test rename to lldb/test/Shell/Settings/TestEchoCommands.test diff --git a/lldb/lit/Settings/TestFrameFormatColor.test b/lldb/test/Shell/Settings/TestFrameFormatColor.test rename from lldb/lit/Settings/TestFrameFormatColor.test rename to lldb/test/Shell/Settings/TestFrameFormatColor.test diff --git a/lldb/lit/Settings/TestFrameFormatNoColor.test b/lldb/test/Shell/Settings/TestFrameFormatNoColor.test rename from lldb/lit/Settings/TestFrameFormatNoColor.test rename to lldb/test/Shell/Settings/TestFrameFormatNoColor.test diff --git a/lldb/lit/Settings/TestModuleCacheSanity.test b/lldb/test/Shell/Settings/TestModuleCacheSanity.test rename from lldb/lit/Settings/TestModuleCacheSanity.test rename to lldb/test/Shell/Settings/TestModuleCacheSanity.test diff --git a/lldb/lit/Settings/TestSettingsSet.test b/lldb/test/Shell/Settings/TestSettingsSet.test rename from lldb/lit/Settings/TestSettingsSet.test rename to lldb/test/Shell/Settings/TestSettingsSet.test diff --git a/lldb/lit/Settings/TestSettingsWrite.test b/lldb/test/Shell/Settings/TestSettingsWrite.test rename from lldb/lit/Settings/TestSettingsWrite.test rename to lldb/test/Shell/Settings/TestSettingsWrite.test diff --git a/lldb/lit/Settings/TestStopCommandSourceOnError.test b/lldb/test/Shell/Settings/TestStopCommandSourceOnError.test rename from lldb/lit/Settings/TestStopCommandSourceOnError.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/basic-elf.yaml rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/basic-macho.yaml rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/line-table-discontinuous-file-ids.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/line-table-edgecases.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/line-table-missing-file.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/line-table-mixed-path-styles.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/line-table.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.yaml rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/symtab-macho.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/symtab.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-raSearch.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.yaml rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.syms rename to 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 rename from lldb/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.yaml rename to 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 rename from lldb/lit/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/line-table-edgecases.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/line-table-missing-file.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/line-table-mixed-path-styles.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/line-table.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/stack-cfi-parsing.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/symtab-macho.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/symtab.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/unwind-via-raSearch.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/unwind-via-stack-cfi.test rename to 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 rename from lldb/lit/SymbolFile/Breakpad/unwind-via-stack-win.test rename to 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 rename from lldb/lit/SymbolFile/DWARF/Inputs/debug-line-basic.script rename to 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 rename from lldb/lit/SymbolFile/DWARF/Inputs/debug-types-basic.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/Inputs/debug-types-expressions.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit rename to 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 rename from lldb/lit/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit rename to 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 rename from lldb/lit/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit rename to 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 rename from lldb/lit/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/apple-index-is-used.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/array-sizes.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/childless-compile-unit.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/compilercontext.ll rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-line-basic.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-names-compressed.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-types-address-ranges.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-types-basic.test rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-types-dwarf5.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-types-expressions.test rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-types-line-tables.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-types-missing-signature.test rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug-types-signature-loop.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug_aranges-empty-section.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug_loc.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug_ranges-missing-section.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug_ranges.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug_ranges_and_rnglists.test rename to 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 rename from lldb/lit/SymbolFile/DWARF/debug_rnglists.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/deterministic-build.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/dir-separator-no-comp-dir.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/dir-separator-posix.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/dir-separator-windows.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/dwarf5-index-is-used.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/dwarf5-partial-index.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/dwarf5_locations.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-basic-function.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-basic-namespace.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-basic-type.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-basic-variable.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-function-regex.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-inline-method.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-method-local-struct.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-method.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-qualified-variable.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-type-in-function.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-variable-dwo.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/find-variable-file.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/forward-declarations.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/gnu-style-compression.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/lit.local.cfg rename to 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 rename from lldb/lit/SymbolFile/DWARF/parallel-indexing-stress.s rename to 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 rename from lldb/lit/SymbolFile/DWARF/split-dwarf-inlining.cpp rename to 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 rename from lldb/lit/SymbolFile/DWARF/split-dwarf-multiple-cu.ll rename to 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 rename from lldb/lit/SymbolFile/Inputs/sizeless-symbol.s rename to 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 rename from lldb/lit/SymbolFile/Inputs/target-symbols-add-unwind.c rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/ast-functions.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/ast-methods.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/ast-types.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/bitfields.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/break-by-function.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/break-by-line.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/disassembly.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/function-types-builtins.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/function-types-calling-conv.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/function-types-classes.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/globals-classes.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/globals-fundamental.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/local-variables.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/nested-types.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/s_constant.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/s_constant.s rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/source-list.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/stack_unwinding01.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/Inputs/tag-types.lldbinit rename to 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 rename from lldb/lit/SymbolFile/NativePDB/ast-functions-msvc.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/ast-functions.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/ast-methods.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/ast-types.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/bitfields.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/break-by-function.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/break-by-line.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/disassembly.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/function-types-builtins.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/function-types-calling-conv.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/global-classes.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/globals-bss.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/local-variables.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/nested-types.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/s_constant.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/source-list.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/stack_unwinding01.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/tag-types.cpp rename to 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 rename from lldb/lit/SymbolFile/NativePDB/typedefs.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/AstRestoreTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/CompilandsTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest0.script rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest1.script rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/ExpressionsTest2.script rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/FuncSymbols.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp rename to lldb/test/Shell/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp diff --git a/lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h rename from lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h rename to lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h diff --git a/lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp rename from lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp rename to lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp diff --git a/lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord b/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord rename from lldb/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/PointerTypeTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/TypeQualsTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/UdtLayoutTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/UdtLayoutTest.script rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/VBases.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/VBases.script rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.script rename to 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 rename from lldb/lit/SymbolFile/PDB/Inputs/VariablesTest.cpp rename to 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 rename from lldb/lit/SymbolFile/PDB/ast-restore.test rename to 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 rename from lldb/lit/SymbolFile/PDB/calling-conventions.test rename to 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 rename from lldb/lit/SymbolFile/PDB/class-layout.test rename to 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 rename from lldb/lit/SymbolFile/PDB/compilands.test rename to 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 rename from lldb/lit/SymbolFile/PDB/enums-layout.test rename to 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 rename from lldb/lit/SymbolFile/PDB/expressions.test rename to 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 rename from lldb/lit/SymbolFile/PDB/func-symbols.test rename to 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 rename from lldb/lit/SymbolFile/PDB/function-level-linking.test rename to 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 rename from lldb/lit/SymbolFile/PDB/function-nested-block.test rename to 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 rename from lldb/lit/SymbolFile/PDB/pointers.test rename to 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 rename from lldb/lit/SymbolFile/PDB/type-quals.test rename to 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 rename from lldb/lit/SymbolFile/PDB/typedefs.test rename to 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 rename from lldb/lit/SymbolFile/PDB/udt-layout.test rename to 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 rename from lldb/lit/SymbolFile/PDB/variables-locations.test rename to 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 rename from lldb/lit/SymbolFile/PDB/variables.test rename to lldb/test/Shell/SymbolFile/PDB/variables.test diff --git a/lldb/lit/SymbolFile/PDB/vbases.test b/lldb/test/Shell/SymbolFile/PDB/vbases.test rename from lldb/lit/SymbolFile/PDB/vbases.test rename to 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 rename from lldb/lit/SymbolFile/dissassemble-entry-point.s rename to 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 rename from lldb/lit/SymbolFile/sizeless-symbol.test rename to 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 rename from lldb/lit/SymbolFile/target-symbols-add-unwind.test rename to 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 rename from lldb/lit/Unwind/Inputs/call-asm.c rename to 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 rename from lldb/lit/Unwind/Inputs/eh-frame-dwarf-unwind.s rename to 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 rename from lldb/lit/Unwind/Inputs/eh-frame-small-fde.s rename to 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 rename from lldb/lit/Unwind/Inputs/prefer-debug-over-eh-frame.s rename to 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 rename from lldb/lit/Unwind/Inputs/trap_frame_sym_ctx.s rename to 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 rename from lldb/lit/Unwind/Inputs/unwind-plan-dwarf-dump.s rename to 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 rename from lldb/lit/Unwind/eh-frame-dwarf-unwind.test rename to 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 rename from lldb/lit/Unwind/eh-frame-small-fde.test rename to 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 rename from lldb/lit/Unwind/prefer-debug-over-eh-frame.test rename to 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 rename from lldb/lit/Unwind/trap_frame_sym_ctx.test rename to 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 rename from lldb/lit/Unwind/unwind-plan-dwarf-dump.test rename to 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 rename from lldb/lit/Watchpoint/Inputs/main.cpp rename to lldb/test/Shell/Watchpoint/Inputs/main.cpp diff --git a/lldb/lit/Watchpoint/SetErrorCases.test b/lldb/test/Shell/Watchpoint/SetErrorCases.test rename from lldb/lit/Watchpoint/SetErrorCases.test rename to lldb/test/Shell/Watchpoint/SetErrorCases.test diff --git a/lldb/lit/helper/__init__.py b/lldb/test/Shell/helper/__init__.py rename from lldb/lit/helper/__init__.py rename to lldb/test/Shell/helper/__init__.py diff --git a/lldb/lit/helper/build.py b/lldb/test/Shell/helper/build.py rename from lldb/lit/helper/build.py rename to lldb/test/Shell/helper/build.py diff --git a/lldb/lit/helper/toolchain.py b/lldb/test/Shell/helper/toolchain.py rename from lldb/lit/helper/toolchain.py rename to lldb/test/Shell/helper/toolchain.py --- a/lldb/lit/helper/toolchain.py +++ b/lldb/test/Shell/helper/toolchain.py @@ -29,7 +29,7 @@ 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 rename from lldb/lit/lit-lldb-init.in rename to lldb/test/Shell/lit-lldb-init.in diff --git a/lldb/lit/lit.cfg.py b/lldb/test/Shell/lit.cfg.py rename from lldb/lit/lit.cfg.py rename to lldb/test/Shell/lit.cfg.py --- a/lldb/lit/lit.cfg.py +++ b/lldb/test/Shell/lit.cfg.py @@ -17,7 +17,7 @@ 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.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 rename from lldb/lit/lit.site.cfg.py.in rename to lldb/test/Shell/lit.site.cfg.py.in --- a/lldb/lit/lit.site.cfg.py.in +++ b/lldb/test/Shell/lit.site.cfg.py.in @@ -41,4 +41,4 @@ 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 --- /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 rename from lldb/lit/Unit/lit.cfg.py rename to lldb/test/Unit/lit.cfg.py --- a/lldb/lit/Unit/lit.cfg.py +++ b/lldb/test/Unit/lit.cfg.py @@ -9,7 +9,7 @@ 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/lit/Unit/lit.site.cfg.py.in b/lldb/test/Unit/lit.site.cfg.py.in rename from lldb/lit/Unit/lit.site.cfg.py.in rename to lldb/test/Unit/lit.site.cfg.py.in --- a/lldb/lit/Unit/lit.site.cfg.py.in +++ b/lldb/test/Unit/lit.site.cfg.py.in @@ -26,4 +26,4 @@ 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/Unit/lit.cfg.py") diff --git a/lldb/test/lit.cfg.py b/lldb/test/lit.cfg.py new file mode 100644 --- /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()