Re-land "[test] Split LLDB tests into API, Shell & Unit"
The original patch got reverted because it broke `check-lldb` on a clean
build. This fixes that.
llvm-svn: 374201
GitOrigin-RevId: 87aa9c9e4d41ed881453e2fab85b3d25f648bb55
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 317643a..58a7ef1 100644
--- a/CMakeLists.txt
+++ b/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/lit/CMakeLists.txt b/lit/CMakeLists.txt
deleted file mode 100644
index 3e759b0..0000000
--- a/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/test/API/CMakeLists.txt b/test/API/CMakeLists.txt
new file mode 100644
index 0000000..4f787d2
--- /dev/null
+++ b/test/API/CMakeLists.txt
@@ -0,0 +1,133 @@
+function(add_python_test_target name test_script args comment)
+ set(PYTHON_TEST_COMMAND
+ ${PYTHON_EXECUTABLE}
+ ${test_script}
+ ${args}
+ )
+
+ add_custom_target(${name}
+ COMMAND ${PYTHON_TEST_COMMAND} ${ARG_DEFAULT_ARGS}
+ COMMENT "${comment}"
+ USES_TERMINAL
+ )
+ add_dependencies(${name} lldb-test-deps)
+endfunction()
+
+# The default architecture with which to compile test executables is the default LLVM target
+# architecture, which itself defaults to the host architecture.
+string(TOLOWER "${LLVM_TARGET_ARCH}" LLDB_DEFAULT_TEST_ARCH)
+if( LLDB_DEFAULT_TEST_ARCH STREQUAL "host" )
+ string(REGEX MATCH "^[^-]*" LLDB_DEFAULT_TEST_ARCH ${LLVM_HOST_TRIPLE})
+endif ()
+
+# Allow the user to override the default by setting LLDB_TEST_ARCH
+set(LLDB_TEST_ARCH
+ ${LLDB_DEFAULT_TEST_ARCH}
+ CACHE STRING "Specify the architecture to run LLDB tests as (x86|x64). Determines whether tests are compiled with -m32 or -m64")
+
+# Users can override LLDB_TEST_USER_ARGS to specify arbitrary arguments to pass to the script
+set(LLDB_TEST_USER_ARGS
+ ""
+ CACHE STRING "Specify additional arguments to pass to test runner. For example: '-C gcc -C clang -A i386 -A x86_64'")
+
+# The .noindex suffix is a marker for Spotlight to never index the
+# build directory. LLDB queries Spotlight to locate .dSYM bundles
+# based on the UUID embedded in a binary, and because the UUID is a
+# hash of filename and .text section, there *will* be conflicts inside
+# the build directory.
+set(LLDB_TEST_COMMON_ARGS
+ --arch=${LLDB_TEST_ARCH}
+ -s
+ ${CMAKE_BINARY_DIR}/lldb-test-traces
+ -S nm
+ -u CXXFLAGS
+ -u CFLAGS
+ )
+
+list(APPEND LLDB_TEST_COMMON_ARGS
+ --executable ${LLDB_TEST_EXECUTABLE}
+ --dsymutil ${LLDB_TEST_DSYMUTIL}
+ --filecheck ${LLDB_TEST_FILECHECK}
+ -C ${LLDB_TEST_C_COMPILER}
+ )
+
+if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+ # All tests are currently flaky on Windows, so rerun them all once when they fail.
+ set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --rerun-all-issues)
+
+ set(LLDB_TEST_DEBUG_TEST_CRASHES
+ 0
+ CACHE BOOL "(Windows only) Enables debugging of tests in the test suite by showing the crash dialog when lldb crashes")
+
+ set(LLDB_TEST_HIDE_CONSOLE_WINDOWS
+ 1
+ CACHE BOOL "(Windows only) Hides the console window for an inferior when it is launched through the test suite")
+
+ if (LLDB_TEST_DEBUG_TEST_CRASHES)
+ set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --enable-crash-dialog)
+ endif()
+
+ if (NOT LLDB_TEST_HIDE_CONSOLE_WINDOWS)
+ set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --show-inferior-console)
+ endif()
+endif()
+
+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows|Darwin")
+ list(APPEND LLDB_TEST_COMMON_ARGS
+ --env ARCHIVER=${CMAKE_AR} --env OBJCOPY=${CMAKE_OBJCOPY})
+endif()
+
+if (NOT "${LLDB_LIT_TOOLS_DIR}" STREQUAL "")
+ if (NOT EXISTS "${LLDB_LIT_TOOLS_DIR}")
+ message(WARNING "LLDB_LIT_TOOLS_DIR ${LLDB_LIT_TOOLS_DIR} does not exist.")
+ endif()
+endif()
+
+if(CMAKE_HOST_APPLE)
+ if(LLDB_BUILD_FRAMEWORK)
+ get_target_property(framework_build_dir liblldb LIBRARY_OUTPUT_DIRECTORY)
+ list(APPEND LLDB_TEST_COMMON_ARGS --framework ${framework_build_dir}/LLDB.framework)
+ endif()
+
+ # Use the same identity for testing
+ get_property(code_sign_identity_used GLOBAL PROPERTY LLDB_DEBUGSERVER_CODESIGN_IDENTITY)
+ if(code_sign_identity_used)
+ list(APPEND LLDB_TEST_COMMON_ARGS --codesign-identity "${code_sign_identity_used}")
+ endif()
+
+ if(LLDB_USE_SYSTEM_DEBUGSERVER)
+ lldb_find_system_debugserver(system_debugserver_path)
+ add_custom_target(debugserver
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${system_debugserver_path} ${LLVM_RUNTIME_OUTPUT_INTDIR}
+ COMMENT "Copying the system debugserver to LLDB's binaries directory for testing.")
+ # The custom target for the system debugserver has no install target, so we
+ # need to remove it from the LLVM_DISTRIBUTION_COMPONENTS list.
+ if (LLVM_DISTRIBUTION_COMPONENTS)
+ list(REMOVE_ITEM LLVM_DISTRIBUTION_COMPONENTS debugserver)
+ set(LLVM_DISTRIBUTION_COMPONENTS ${LLVM_DISTRIBUTION_COMPONENTS} PARENT_SCOPE)
+ endif()
+ message(STATUS "LLDB tests use out-of-tree debugserver: ${system_debugserver_path}")
+ list(APPEND LLDB_TEST_COMMON_ARGS --out-of-tree-debugserver)
+ add_lldb_test_dependency(debugserver)
+ elseif(TARGET debugserver)
+ set(debugserver_path ${LLVM_RUNTIME_OUTPUT_INTDIR}/debugserver)
+ message(STATUS "LLDB Tests use just-built debugserver: ${debugserver_path}")
+ list(APPEND LLDB_TEST_COMMON_ARGS --server ${debugserver_path})
+ add_lldb_test_dependency(debugserver)
+ elseif(TARGET lldb-server)
+ set(lldb_server_path ${LLVM_RUNTIME_OUTPUT_INTDIR}/lldb-server)
+ message(STATUS "LLDB Tests use just-built lldb-server: ${lldb_server_path}")
+ list(APPEND LLDB_TEST_COMMON_ARGS --server ${lldb_server_path})
+ add_lldb_test_dependency(lldb-server)
+ else()
+ message(WARNING "LLDB Tests enabled, but no server available")
+ endif()
+endif()
+
+set(LLDB_DOTEST_ARGS ${LLDB_TEST_COMMON_ARGS};${LLDB_TEST_USER_ARGS})
+set_property(GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY ${LLDB_DOTEST_ARGS})
+
+# This will add LLDB's test dependencies to the dependencies for check-all and
+# include them in the test-depends target.
+set_property(GLOBAL APPEND PROPERTY LLVM_LIT_DEPENDS ${ARG_DEPENDS})
diff --git a/test/API/README.md b/test/API/README.md
new file mode 100644
index 0000000..fbb3713
--- /dev/null
+++ b/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/test/dotest.py b/test/API/dotest.py
similarity index 100%
rename from test/dotest.py
rename to test/API/dotest.py
diff --git a/lit/Suite/lit.cfg b/test/API/lit.cfg
similarity index 96%
rename from lit/Suite/lit.cfg
rename to test/API/lit.cfg
index 9504f4c..bb9e3aa 100644
--- a/lit/Suite/lit.cfg
+++ b/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/lit/Suite/lit.site.cfg.in b/test/API/lit.site.cfg.in
similarity index 93%
rename from lit/Suite/lit.site.cfg.in
rename to test/API/lit.site.cfg.in
index 306967d..883bc40 100644
--- a/lit/Suite/lit.site.cfg.in
+++ b/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/lit/Suite/lldbtest.py b/test/API/lldbtest.py
similarity index 100%
rename from lit/Suite/lldbtest.py
rename to test/API/lldbtest.py
diff --git a/test/testcases b/test/API/testcases
similarity index 100%
rename from test/testcases
rename to test/API/testcases
diff --git a/test/use_lldb_suite.py b/test/API/use_lldb_suite.py
similarity index 100%
rename from test/use_lldb_suite.py
rename to test/API/use_lldb_suite.py
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7080dc4..d54e9ce 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,149 +1,127 @@
-function(add_python_test_target name test_script args comment)
- set(PYTHON_TEST_COMMAND
- ${PYTHON_EXECUTABLE}
- ${test_script}
- ${args}
- )
+# Test runner infrastructure for LLDB. This configures the LLDB test trees
+# for use by Lit, and delegates to LLVM's lit test handlers.
- add_custom_target(${name}
- COMMAND ${PYTHON_TEST_COMMAND} ${ARG_DEFAULT_ARGS}
- COMMENT "${comment}"
- USES_TERMINAL
- )
- add_dependencies(${name} lldb-test-deps)
-endfunction()
+add_subdirectory(API)
-# 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})
+# 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 ()
-# Allow the user to override the default by setting LLDB_TEST_ARCH
-set(LLDB_TEST_ARCH
- ${LLDB_DEFAULT_TEST_ARCH}
- CACHE STRING "Specify the architecture to run LLDB tests as (x86|x64). Determines whether tests are compiled with -m32 or -m64")
-
-# Users can override LLDB_TEST_USER_ARGS to specify arbitrary arguments to pass to the script
-set(LLDB_TEST_USER_ARGS
- ""
- CACHE STRING "Specify additional arguments to pass to test runner. For example: '-C gcc -C clang -A i386 -A x86_64'")
-
-# The .noindex suffix is a marker for Spotlight to never index the
-# build directory. LLDB queries Spotlight to locate .dSYM bundles
-# based on the UUID embedded in a binary, and because the UUID is a
-# hash of filename and .text section, there *will* be conflicts inside
-# the build directory.
-set(LLDB_TEST_COMMON_ARGS
- --arch=${LLDB_TEST_ARCH}
- -s
- ${CMAKE_BINARY_DIR}/lldb-test-traces
- -S nm
- -u CXXFLAGS
- -u CFLAGS
- )
-
-list(APPEND LLDB_TEST_COMMON_ARGS
- --executable ${LLDB_TEST_EXECUTABLE}
- --dsymutil ${LLDB_TEST_DSYMUTIL}
- --filecheck ${LLDB_TEST_FILECHECK}
- -C ${LLDB_TEST_C_COMPILER}
- )
-
-if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
- # All tests are currently flaky on Windows, so rerun them all once when they fail.
- set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --rerun-all-issues)
-
- set(LLDB_TEST_DEBUG_TEST_CRASHES
- 0
- CACHE BOOL "(Windows only) Enables debugging of tests in the test suite by showing the crash dialog when lldb crashes")
-
- set(LLDB_TEST_HIDE_CONSOLE_WINDOWS
- 1
- CACHE BOOL "(Windows only) Hides the console window for an inferior when it is launched through the test suite")
-
- if (LLDB_TEST_DEBUG_TEST_CRASHES)
- set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --enable-crash-dialog)
- endif()
-
- if (NOT LLDB_TEST_HIDE_CONSOLE_WINDOWS)
- set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --show-inferior-console)
- endif()
+if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(LLDB_IS_64_BITS 1)
endif()
-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows|Darwin")
- list(APPEND LLDB_TEST_COMMON_ARGS
- --env ARCHIVER=${CMAKE_AR} --env OBJCOPY=${CMAKE_OBJCOPY})
-endif()
+get_property(LLDB_DOTEST_ARGS GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY)
+set(dotest_args_replacement ${LLVM_BUILD_MODE})
-if (NOT "${LLDB_LIT_TOOLS_DIR}" STREQUAL "")
- if (NOT EXISTS "${LLDB_LIT_TOOLS_DIR}")
- message(WARNING "LLDB_LIT_TOOLS_DIR ${LLDB_LIT_TOOLS_DIR} does not exist.")
- endif()
-endif()
+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(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()
+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}")
- # Use the same identity for testing
- get_property(code_sign_identity_used GLOBAL PROPERTY LLDB_DEBUGSERVER_CODESIGN_IDENTITY)
- if(code_sign_identity_used)
- list(APPEND LLDB_TEST_COMMON_ARGS --codesign-identity "${code_sign_identity_used}")
- endif()
-
- if(LLDB_USE_SYSTEM_DEBUGSERVER)
- lldb_find_system_debugserver(system_debugserver_path)
- add_custom_target(debugserver
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${system_debugserver_path} ${LLVM_RUNTIME_OUTPUT_INTDIR}
- COMMENT "Copying the system debugserver to LLDB's binaries directory for testing.")
- # The custom target for the system debugserver has no install target, so we
- # need to remove it from the LLVM_DISTRIBUTION_COMPONENTS list.
- if (LLVM_DISTRIBUTION_COMPONENTS)
- list(REMOVE_ITEM LLVM_DISTRIBUTION_COMPONENTS debugserver)
- set(LLVM_DISTRIBUTION_COMPONENTS ${LLVM_DISTRIBUTION_COMPONENTS} PARENT_SCOPE)
+ # 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()
- 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")
+ # Common case: LLVM used a single-configuration generator like Ninja.
+ set(dotest_args_replacement ".")
endif()
endif()
-set(LLDB_DOTEST_ARGS ${LLDB_TEST_COMMON_ARGS};${LLDB_TEST_USER_ARGS})
-set_property(GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY ${LLDB_DOTEST_ARGS})
+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)
+else()
+ # LLD is required to link test executables on Windows.
+ if (CMAKE_SYSTEM_NAME MATCHES "Windows")
+ message(WARNING "lld required to test LLDB on Windows")
+ endif()
+endif()
+
+# the value is not canonicalized within LLVM
+llvm_canonicalize_cmake_booleans(
+ LLDB_DISABLE_PYTHON
+ LLVM_ENABLE_ZLIB
+ LLVM_ENABLE_SHARED_LIBS
+ LLDB_IS_64_BITS)
+
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.site.cfg.py.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Shell/lit.site.cfg.py
+ MAIN_CONFIG
+ ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.cfg.py)
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
+ MAIN_CONFIG
+ ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py)
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/API/lit.site.cfg.in
+ ${CMAKE_CURRENT_BINARY_DIR}/API/lit.site.cfg)
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
+ MAIN_CONFIG
+ ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.cfg.py)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit-lldb-init.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Shell/lit-lldb-init)
+
+if(NOT LLDB_BUILT_STANDALONE)
+ add_lldb_test_dependency(
+ FileCheck
+ count
+ not
+ )
+endif()
+
+
+add_lit_testsuites(LLDB
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ DEPENDS lldb-test-deps
+ )
+
+add_lit_testsuite(check-lldb-lit "Running lldb lit test suite"
+ ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS lldb-test-deps
+ )
+
+set_target_properties(check-lldb-lit PROPERTIES FOLDER "lldb tests")
add_custom_target(check-lldb)
add_dependencies(check-lldb lldb-test-deps)
set_target_properties(check-lldb PROPERTIES FOLDER "lldb misc")
-
-# LLD is required to link test executables on Windows.
-if (CMAKE_SYSTEM_NAME MATCHES "Windows")
- if (TARGET lld)
- add_lldb_test_dependency(lld)
- else ()
- message(WARNING "lld required to test LLDB on Windows")
- endif ()
-endif ()
-
-# Run the lit-style tests and the unittests as part of the check-lldb target.
add_dependencies(check-lldb check-lldb-lit)
-
-# This will add LLDB's test dependencies to the dependencies for check-all and
-# include them in the test-depends target.
-set_property(GLOBAL APPEND PROPERTY LLVM_LIT_DEPENDS ${ARG_DEPENDS})
diff --git a/lit/Breakpoint/Inputs/case-sensitive.c b/test/Shell/Breakpoint/Inputs/case-sensitive.c
similarity index 100%
rename from lit/Breakpoint/Inputs/case-sensitive.c
rename to test/Shell/Breakpoint/Inputs/case-sensitive.c
diff --git a/lit/Breakpoint/Inputs/debug_addrx.yaml b/test/Shell/Breakpoint/Inputs/debug_addrx.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/debug_addrx.yaml
rename to test/Shell/Breakpoint/Inputs/debug_addrx.yaml
diff --git a/lit/Breakpoint/Inputs/debug_rnglist_basic.yaml b/test/Shell/Breakpoint/Inputs/debug_rnglist_basic.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/debug_rnglist_basic.yaml
rename to test/Shell/Breakpoint/Inputs/debug_rnglist_basic.yaml
diff --git a/lit/Breakpoint/Inputs/debug_rnglist_offset_pair.yaml b/test/Shell/Breakpoint/Inputs/debug_rnglist_offset_pair.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/debug_rnglist_offset_pair.yaml
rename to test/Shell/Breakpoint/Inputs/debug_rnglist_offset_pair.yaml
diff --git a/lit/Breakpoint/Inputs/debug_rnglist_rlestartend.yaml b/test/Shell/Breakpoint/Inputs/debug_rnglist_rlestartend.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/debug_rnglist_rlestartend.yaml
rename to test/Shell/Breakpoint/Inputs/debug_rnglist_rlestartend.yaml
diff --git a/lit/Breakpoint/Inputs/debug_rnglistx_rlex.yaml b/test/Shell/Breakpoint/Inputs/debug_rnglistx_rlex.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/debug_rnglistx_rlex.yaml
rename to test/Shell/Breakpoint/Inputs/debug_rnglistx_rlex.yaml
diff --git a/lit/Breakpoint/Inputs/implicit_const_form_support.yaml b/test/Shell/Breakpoint/Inputs/implicit_const_form_support.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/implicit_const_form_support.yaml
rename to test/Shell/Breakpoint/Inputs/implicit_const_form_support.yaml
diff --git a/lit/Breakpoint/Inputs/jitbp.cpp b/test/Shell/Breakpoint/Inputs/jitbp.cpp
similarity index 100%
rename from lit/Breakpoint/Inputs/jitbp.cpp
rename to test/Shell/Breakpoint/Inputs/jitbp.cpp
diff --git a/lit/Breakpoint/Inputs/ppc64-localentry.s b/test/Shell/Breakpoint/Inputs/ppc64-localentry.s
similarity index 100%
rename from lit/Breakpoint/Inputs/ppc64-localentry.s
rename to test/Shell/Breakpoint/Inputs/ppc64-localentry.s
diff --git a/lit/Breakpoint/Inputs/single-file-split-dwarf.o.yaml b/test/Shell/Breakpoint/Inputs/single-file-split-dwarf.o.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/single-file-split-dwarf.o.yaml
rename to test/Shell/Breakpoint/Inputs/single-file-split-dwarf.o.yaml
diff --git a/lit/Breakpoint/Inputs/single-file-split-dwarf.yaml b/test/Shell/Breakpoint/Inputs/single-file-split-dwarf.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/single-file-split-dwarf.yaml
rename to test/Shell/Breakpoint/Inputs/single-file-split-dwarf.yaml
diff --git a/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml b/test/Shell/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml
rename to test/Shell/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml
diff --git a/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.yaml b/test/Shell/Breakpoint/Inputs/split-dwarf-5-addrbase.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/split-dwarf-5-addrbase.yaml
rename to test/Shell/Breakpoint/Inputs/split-dwarf-5-addrbase.yaml
diff --git a/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml b/test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml
rename to test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml
diff --git a/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml b/test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml
rename to test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml
diff --git a/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-main.yaml b/test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-main.yaml
similarity index 100%
rename from lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-main.yaml
rename to test/Shell/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-main.yaml
diff --git a/lit/Breakpoint/case-insensitive.test b/test/Shell/Breakpoint/case-insensitive.test
similarity index 100%
rename from lit/Breakpoint/case-insensitive.test
rename to test/Shell/Breakpoint/case-insensitive.test
diff --git a/lit/Breakpoint/case-sensitive.test b/test/Shell/Breakpoint/case-sensitive.test
similarity index 100%
rename from lit/Breakpoint/case-sensitive.test
rename to test/Shell/Breakpoint/case-sensitive.test
diff --git a/lit/Breakpoint/debug_addrx.test b/test/Shell/Breakpoint/debug_addrx.test
similarity index 100%
rename from lit/Breakpoint/debug_addrx.test
rename to test/Shell/Breakpoint/debug_addrx.test
diff --git a/lit/Breakpoint/debug_rnglist_basic.test b/test/Shell/Breakpoint/debug_rnglist_basic.test
similarity index 100%
rename from lit/Breakpoint/debug_rnglist_basic.test
rename to test/Shell/Breakpoint/debug_rnglist_basic.test
diff --git a/lit/Breakpoint/debug_rnglist_offset_pair.test b/test/Shell/Breakpoint/debug_rnglist_offset_pair.test
similarity index 100%
rename from lit/Breakpoint/debug_rnglist_offset_pair.test
rename to test/Shell/Breakpoint/debug_rnglist_offset_pair.test
diff --git a/lit/Breakpoint/debug_rnglist_rlestartend.test b/test/Shell/Breakpoint/debug_rnglist_rlestartend.test
similarity index 100%
rename from lit/Breakpoint/debug_rnglist_rlestartend.test
rename to test/Shell/Breakpoint/debug_rnglist_rlestartend.test
diff --git a/lit/Breakpoint/debug_rnglistx_rlex.test b/test/Shell/Breakpoint/debug_rnglistx_rlex.test
similarity index 100%
rename from lit/Breakpoint/debug_rnglistx_rlex.test
rename to test/Shell/Breakpoint/debug_rnglistx_rlex.test
diff --git a/lit/Breakpoint/implicit_const_form_support.test b/test/Shell/Breakpoint/implicit_const_form_support.test
similarity index 100%
rename from lit/Breakpoint/implicit_const_form_support.test
rename to test/Shell/Breakpoint/implicit_const_form_support.test
diff --git a/lit/Breakpoint/jitbp_elf.test b/test/Shell/Breakpoint/jitbp_elf.test
similarity index 100%
rename from lit/Breakpoint/jitbp_elf.test
rename to test/Shell/Breakpoint/jitbp_elf.test
diff --git a/lit/Breakpoint/ppc64-localentry.test b/test/Shell/Breakpoint/ppc64-localentry.test
similarity index 100%
rename from lit/Breakpoint/ppc64-localentry.test
rename to test/Shell/Breakpoint/ppc64-localentry.test
diff --git a/lit/Breakpoint/single-file-split-dwarf.test b/test/Shell/Breakpoint/single-file-split-dwarf.test
similarity index 100%
rename from lit/Breakpoint/single-file-split-dwarf.test
rename to test/Shell/Breakpoint/single-file-split-dwarf.test
diff --git a/lit/Breakpoint/split-dwarf-5-addrbase.test b/test/Shell/Breakpoint/split-dwarf-5-addrbase.test
similarity index 100%
rename from lit/Breakpoint/split-dwarf-5-addrbase.test
rename to test/Shell/Breakpoint/split-dwarf-5-addrbase.test
diff --git a/lit/Breakpoint/split-dwarf5-debug-stroffsets.test b/test/Shell/Breakpoint/split-dwarf5-debug-stroffsets.test
similarity index 100%
rename from lit/Breakpoint/split-dwarf5-debug-stroffsets.test
rename to test/Shell/Breakpoint/split-dwarf5-debug-stroffsets.test
diff --git a/lit/BuildScript/compiler-full-path.test b/test/Shell/BuildScript/compiler-full-path.test
similarity index 100%
rename from lit/BuildScript/compiler-full-path.test
rename to test/Shell/BuildScript/compiler-full-path.test
diff --git a/lit/BuildScript/modes.test b/test/Shell/BuildScript/modes.test
similarity index 100%
rename from lit/BuildScript/modes.test
rename to test/Shell/BuildScript/modes.test
diff --git a/lit/BuildScript/script-args.test b/test/Shell/BuildScript/script-args.test
similarity index 100%
rename from lit/BuildScript/script-args.test
rename to test/Shell/BuildScript/script-args.test
diff --git a/lit/BuildScript/toolchain-clang-cl.test b/test/Shell/BuildScript/toolchain-clang-cl.test
similarity index 100%
rename from lit/BuildScript/toolchain-clang-cl.test
rename to test/Shell/BuildScript/toolchain-clang-cl.test
diff --git a/lit/BuildScript/toolchain-clang.test b/test/Shell/BuildScript/toolchain-clang.test
similarity index 100%
rename from lit/BuildScript/toolchain-clang.test
rename to test/Shell/BuildScript/toolchain-clang.test
diff --git a/lit/BuildScript/toolchain-msvc.test b/test/Shell/BuildScript/toolchain-msvc.test
similarity index 100%
rename from lit/BuildScript/toolchain-msvc.test
rename to test/Shell/BuildScript/toolchain-msvc.test
diff --git a/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test b/test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test
similarity index 100%
rename from lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test
rename to test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputConsole.test
diff --git a/lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test b/test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test
similarity index 100%
rename from lit/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test
rename to test/Shell/Commands/CommandScriptImmediateOutput/CommandScriptImmediateOutputFile.test
diff --git a/lit/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py b/test/Shell/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
similarity index 100%
rename from lit/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
rename to test/Shell/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
diff --git a/lit/Commands/CommandScriptImmediateOutput/lit.local.cfg b/test/Shell/Commands/CommandScriptImmediateOutput/lit.local.cfg
similarity index 100%
rename from lit/Commands/CommandScriptImmediateOutput/lit.local.cfg
rename to test/Shell/Commands/CommandScriptImmediateOutput/lit.local.cfg
diff --git a/lit/Commands/Inputs/frame.py b/test/Shell/Commands/Inputs/frame.py
similarity index 100%
rename from lit/Commands/Inputs/frame.py
rename to test/Shell/Commands/Inputs/frame.py
diff --git a/lit/Commands/Inputs/main.c b/test/Shell/Commands/Inputs/main.c
similarity index 100%
rename from lit/Commands/Inputs/main.c
rename to test/Shell/Commands/Inputs/main.c
diff --git a/lit/Commands/command-backtrace.test b/test/Shell/Commands/command-backtrace.test
similarity index 100%
rename from lit/Commands/command-backtrace.test
rename to test/Shell/Commands/command-backtrace.test
diff --git a/lit/Commands/command-regex-delete.test b/test/Shell/Commands/command-regex-delete.test
similarity index 100%
rename from lit/Commands/command-regex-delete.test
rename to test/Shell/Commands/command-regex-delete.test
diff --git a/lit/Commands/command-regex-unalias.test b/test/Shell/Commands/command-regex-unalias.test
similarity index 100%
rename from lit/Commands/command-regex-unalias.test
rename to test/Shell/Commands/command-regex-unalias.test
diff --git a/lit/Commands/command-script-import.test b/test/Shell/Commands/command-script-import.test
similarity index 100%
rename from lit/Commands/command-script-import.test
rename to test/Shell/Commands/command-script-import.test
diff --git a/lit/Commands/command-source.test b/test/Shell/Commands/command-source.test
similarity index 100%
rename from lit/Commands/command-source.test
rename to test/Shell/Commands/command-source.test
diff --git a/lit/Driver/Inputs/.lldbinit b/test/Shell/Driver/Inputs/.lldbinit
similarity index 100%
rename from lit/Driver/Inputs/.lldbinit
rename to test/Shell/Driver/Inputs/.lldbinit
diff --git a/lit/Driver/Inputs/Print0.in b/test/Shell/Driver/Inputs/Print0.in
similarity index 100%
rename from lit/Driver/Inputs/Print0.in
rename to test/Shell/Driver/Inputs/Print0.in
diff --git a/lit/Driver/Inputs/Print2.in b/test/Shell/Driver/Inputs/Print2.in
similarity index 100%
rename from lit/Driver/Inputs/Print2.in
rename to test/Shell/Driver/Inputs/Print2.in
diff --git a/lit/Driver/Inputs/Print4.in b/test/Shell/Driver/Inputs/Print4.in
similarity index 100%
rename from lit/Driver/Inputs/Print4.in
rename to test/Shell/Driver/Inputs/Print4.in
diff --git a/lit/Driver/Inputs/Print6.in b/test/Shell/Driver/Inputs/Print6.in
similarity index 100%
rename from lit/Driver/Inputs/Print6.in
rename to test/Shell/Driver/Inputs/Print6.in
diff --git a/lit/Driver/Inputs/convenience.in b/test/Shell/Driver/Inputs/convenience.in
similarity index 100%
rename from lit/Driver/Inputs/convenience.in
rename to test/Shell/Driver/Inputs/convenience.in
diff --git a/lit/Driver/Inputs/hello.c b/test/Shell/Driver/Inputs/hello.c
similarity index 100%
rename from lit/Driver/Inputs/hello.c
rename to test/Shell/Driver/Inputs/hello.c
diff --git a/lit/Driver/Inputs/hello.cpp b/test/Shell/Driver/Inputs/hello.cpp
similarity index 100%
rename from lit/Driver/Inputs/hello.cpp
rename to test/Shell/Driver/Inputs/hello.cpp
diff --git a/lit/Driver/Inputs/process_attach_pid.in b/test/Shell/Driver/Inputs/process_attach_pid.in
similarity index 100%
rename from lit/Driver/Inputs/process_attach_pid.in
rename to test/Shell/Driver/Inputs/process_attach_pid.in
diff --git a/lit/Driver/Inputs/syntax_error.py b/test/Shell/Driver/Inputs/syntax_error.py
similarity index 100%
rename from lit/Driver/Inputs/syntax_error.py
rename to test/Shell/Driver/Inputs/syntax_error.py
diff --git a/lit/Driver/LocalLLDBInit.test b/test/Shell/Driver/LocalLLDBInit.test
similarity index 100%
rename from lit/Driver/LocalLLDBInit.test
rename to test/Shell/Driver/LocalLLDBInit.test
diff --git a/lit/Driver/TestCommands.test b/test/Shell/Driver/TestCommands.test
similarity index 100%
rename from lit/Driver/TestCommands.test
rename to test/Shell/Driver/TestCommands.test
diff --git a/lit/Driver/TestConvenienceVariables.test b/test/Shell/Driver/TestConvenienceVariables.test
similarity index 100%
rename from lit/Driver/TestConvenienceVariables.test
rename to test/Shell/Driver/TestConvenienceVariables.test
diff --git a/lit/Driver/TestCore.test b/test/Shell/Driver/TestCore.test
similarity index 100%
rename from lit/Driver/TestCore.test
rename to test/Shell/Driver/TestCore.test
diff --git a/lit/Driver/TestFile.test b/test/Shell/Driver/TestFile.test
similarity index 100%
rename from lit/Driver/TestFile.test
rename to test/Shell/Driver/TestFile.test
diff --git a/lit/Driver/TestNoUseColor.test b/test/Shell/Driver/TestNoUseColor.test
similarity index 100%
rename from lit/Driver/TestNoUseColor.test
rename to test/Shell/Driver/TestNoUseColor.test
diff --git a/lit/Driver/TestProcessAttach.test b/test/Shell/Driver/TestProcessAttach.test
similarity index 100%
rename from lit/Driver/TestProcessAttach.test
rename to test/Shell/Driver/TestProcessAttach.test
diff --git a/lit/Driver/TestRepl.test b/test/Shell/Driver/TestRepl.test
similarity index 100%
rename from lit/Driver/TestRepl.test
rename to test/Shell/Driver/TestRepl.test
diff --git a/lit/Driver/TestSingleQuote.test b/test/Shell/Driver/TestSingleQuote.test
similarity index 100%
rename from lit/Driver/TestSingleQuote.test
rename to test/Shell/Driver/TestSingleQuote.test
diff --git a/lit/Driver/TestTarget.test b/test/Shell/Driver/TestTarget.test
similarity index 100%
rename from lit/Driver/TestTarget.test
rename to test/Shell/Driver/TestTarget.test
diff --git a/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit b/test/Shell/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit
similarity index 100%
rename from lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit
rename to test/Shell/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit
diff --git a/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit b/test/Shell/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
similarity index 100%
rename from lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
rename to test/Shell/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
diff --git a/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit b/test/Shell/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
similarity index 100%
rename from lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
rename to test/Shell/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
diff --git a/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit b/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit
similarity index 100%
rename from lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit
rename to test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit
diff --git a/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit b/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit
similarity index 100%
rename from lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit
rename to test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit
diff --git a/lit/ExecControl/StopHook/Inputs/stop-hook-threads.cpp b/test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
similarity index 100%
rename from lit/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
rename to test/Shell/ExecControl/StopHook/Inputs/stop-hook-threads.cpp
diff --git a/lit/ExecControl/StopHook/Inputs/stop-hook.c b/test/Shell/ExecControl/StopHook/Inputs/stop-hook.c
similarity index 100%
rename from lit/ExecControl/StopHook/Inputs/stop-hook.c
rename to test/Shell/ExecControl/StopHook/Inputs/stop-hook.c
diff --git a/lit/ExecControl/StopHook/stop-hook-threads.test b/test/Shell/ExecControl/StopHook/stop-hook-threads.test
similarity index 100%
rename from lit/ExecControl/StopHook/stop-hook-threads.test
rename to test/Shell/ExecControl/StopHook/stop-hook-threads.test
diff --git a/lit/ExecControl/StopHook/stop-hook.test b/test/Shell/ExecControl/StopHook/stop-hook.test
similarity index 100%
rename from lit/ExecControl/StopHook/stop-hook.test
rename to test/Shell/ExecControl/StopHook/stop-hook.test
diff --git a/lit/Expr/Inputs/call-function.cpp b/test/Shell/Expr/Inputs/call-function.cpp
similarity index 100%
rename from lit/Expr/Inputs/call-function.cpp
rename to test/Shell/Expr/Inputs/call-function.cpp
diff --git a/lit/Expr/Inputs/ir-memory-map-basic b/test/Shell/Expr/Inputs/ir-memory-map-basic
similarity index 100%
rename from lit/Expr/Inputs/ir-memory-map-basic
rename to test/Shell/Expr/Inputs/ir-memory-map-basic
diff --git a/lit/Expr/Inputs/ir-memory-map-mix-malloc-free b/test/Shell/Expr/Inputs/ir-memory-map-mix-malloc-free
similarity index 100%
rename from lit/Expr/Inputs/ir-memory-map-mix-malloc-free
rename to test/Shell/Expr/Inputs/ir-memory-map-mix-malloc-free
diff --git a/lit/Expr/Inputs/ir-memory-map-overlap1 b/test/Shell/Expr/Inputs/ir-memory-map-overlap1
similarity index 100%
rename from lit/Expr/Inputs/ir-memory-map-overlap1
rename to test/Shell/Expr/Inputs/ir-memory-map-overlap1
diff --git a/lit/Expr/TestIRMemoryMap.test b/test/Shell/Expr/TestIRMemoryMap.test
similarity index 100%
rename from lit/Expr/TestIRMemoryMap.test
rename to test/Shell/Expr/TestIRMemoryMap.test
diff --git a/lit/Expr/TestIRMemoryMapWindows.test b/test/Shell/Expr/TestIRMemoryMapWindows.test
similarity index 100%
rename from lit/Expr/TestIRMemoryMapWindows.test
rename to test/Shell/Expr/TestIRMemoryMapWindows.test
diff --git a/lit/Expr/TestMultilineExpr.test b/test/Shell/Expr/TestMultilineExpr.test
similarity index 100%
rename from lit/Expr/TestMultilineExpr.test
rename to test/Shell/Expr/TestMultilineExpr.test
diff --git a/lit/Expr/TestTypeOfDeclTypeExpr.test b/test/Shell/Expr/TestTypeOfDeclTypeExpr.test
similarity index 100%
rename from lit/Expr/TestTypeOfDeclTypeExpr.test
rename to test/Shell/Expr/TestTypeOfDeclTypeExpr.test
diff --git a/lit/Heap/Inputs/cstr.c b/test/Shell/Heap/Inputs/cstr.c
similarity index 100%
rename from lit/Heap/Inputs/cstr.c
rename to test/Shell/Heap/Inputs/cstr.c
diff --git a/lit/Heap/heap-cstr.test b/test/Shell/Heap/heap-cstr.test
similarity index 100%
rename from lit/Heap/heap-cstr.test
rename to test/Shell/Heap/heap-cstr.test
diff --git a/lit/Host/Inputs/simple.c b/test/Shell/Host/Inputs/simple.c
similarity index 100%
rename from lit/Host/Inputs/simple.c
rename to test/Shell/Host/Inputs/simple.c
diff --git a/lit/Host/TestCustomShell.test b/test/Shell/Host/TestCustomShell.test
similarity index 100%
rename from lit/Host/TestCustomShell.test
rename to test/Shell/Host/TestCustomShell.test
diff --git a/lit/Minidump/Inputs/linux-x86_64.syms b/test/Shell/Minidump/Inputs/linux-x86_64.syms
similarity index 100%
rename from lit/Minidump/Inputs/linux-x86_64.syms
rename to test/Shell/Minidump/Inputs/linux-x86_64.syms
diff --git a/lit/Minidump/Inputs/linux-x86_64.yaml b/test/Shell/Minidump/Inputs/linux-x86_64.yaml
similarity index 100%
rename from lit/Minidump/Inputs/linux-x86_64.yaml
rename to test/Shell/Minidump/Inputs/linux-x86_64.yaml
diff --git a/lit/Minidump/Windows/Inputs/find-module.dmp.yaml b/test/Shell/Minidump/Windows/Inputs/find-module.dmp.yaml
similarity index 100%
rename from lit/Minidump/Windows/Inputs/find-module.dmp.yaml
rename to test/Shell/Minidump/Windows/Inputs/find-module.dmp.yaml
diff --git a/lit/Minidump/Windows/Inputs/find-module.exe.yaml b/test/Shell/Minidump/Windows/Inputs/find-module.exe.yaml
similarity index 100%
rename from lit/Minidump/Windows/Inputs/find-module.exe.yaml
rename to test/Shell/Minidump/Windows/Inputs/find-module.exe.yaml
diff --git a/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.cpp b/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.cpp
similarity index 100%
rename from lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.cpp
rename to test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.cpp
diff --git a/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp b/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp
similarity index 100%
rename from lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp
rename to test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp
Binary files differ
diff --git a/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.lldbinit b/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.lldbinit
similarity index 100%
rename from lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.lldbinit
rename to test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.lldbinit
diff --git a/lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb b/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb
similarity index 100%
rename from lit/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb
rename to test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb
Binary files differ
diff --git a/lit/Minidump/Windows/Sigsegv/sigsegv.test b/test/Shell/Minidump/Windows/Sigsegv/sigsegv.test
similarity index 100%
rename from lit/Minidump/Windows/Sigsegv/sigsegv.test
rename to test/Shell/Minidump/Windows/Sigsegv/sigsegv.test
diff --git a/lit/Minidump/Windows/find-module.test b/test/Shell/Minidump/Windows/find-module.test
similarity index 100%
rename from lit/Minidump/Windows/find-module.test
rename to test/Shell/Minidump/Windows/find-module.test
diff --git a/lit/Minidump/breakpad-symbols.test b/test/Shell/Minidump/breakpad-symbols.test
similarity index 100%
rename from lit/Minidump/breakpad-symbols.test
rename to test/Shell/Minidump/breakpad-symbols.test
diff --git a/lit/Minidump/disassemble-no-module.yaml b/test/Shell/Minidump/disassemble-no-module.yaml
similarity index 100%
rename from lit/Minidump/disassemble-no-module.yaml
rename to test/Shell/Minidump/disassemble-no-module.yaml
diff --git a/lit/Minidump/dump-all.test b/test/Shell/Minidump/dump-all.test
similarity index 100%
rename from lit/Minidump/dump-all.test
rename to test/Shell/Minidump/dump-all.test
diff --git a/lit/Minidump/fb-dump.test b/test/Shell/Minidump/fb-dump.test
similarity index 100%
rename from lit/Minidump/fb-dump.test
rename to test/Shell/Minidump/fb-dump.test
diff --git a/lit/Minidump/lit.local.cfg b/test/Shell/Minidump/lit.local.cfg
similarity index 100%
rename from lit/Minidump/lit.local.cfg
rename to test/Shell/Minidump/lit.local.cfg
diff --git a/lit/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms b/test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-1.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms b/test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-2.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms b/test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/bad-module-id-3.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms b/test/Shell/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/discontiguous-sections.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/identification-linux.syms b/test/Shell/ObjectFile/Breakpad/Inputs/identification-linux.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/identification-linux.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/identification-linux.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms b/test/Shell/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/identification-macosx-arm64e.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/identification-macosx.syms b/test/Shell/ObjectFile/Breakpad/Inputs/identification-macosx.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/identification-macosx.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/identification-macosx.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/identification-windows.syms b/test/Shell/ObjectFile/Breakpad/Inputs/identification-windows.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/identification-windows.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/identification-windows.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms b/test/Shell/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/sections-trailing-func.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/sections.syms b/test/Shell/ObjectFile/Breakpad/Inputs/sections.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/sections.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/sections.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms b/test/Shell/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms
rename to test/Shell/ObjectFile/Breakpad/Inputs/uuid-matching-mac.syms
diff --git a/lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml b/test/Shell/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml
similarity index 100%
rename from lit/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml
rename to test/Shell/ObjectFile/Breakpad/Inputs/uuid-matching-mac.yaml
diff --git a/lit/ObjectFile/Breakpad/breakpad-identification.test b/test/Shell/ObjectFile/Breakpad/breakpad-identification.test
similarity index 100%
rename from lit/ObjectFile/Breakpad/breakpad-identification.test
rename to test/Shell/ObjectFile/Breakpad/breakpad-identification.test
diff --git a/lit/ObjectFile/Breakpad/discontiguous-sections.test b/test/Shell/ObjectFile/Breakpad/discontiguous-sections.test
similarity index 100%
rename from lit/ObjectFile/Breakpad/discontiguous-sections.test
rename to test/Shell/ObjectFile/Breakpad/discontiguous-sections.test
diff --git a/lit/ObjectFile/Breakpad/lit.local.cfg b/test/Shell/ObjectFile/Breakpad/lit.local.cfg
similarity index 100%
rename from lit/ObjectFile/Breakpad/lit.local.cfg
rename to test/Shell/ObjectFile/Breakpad/lit.local.cfg
diff --git a/lit/ObjectFile/Breakpad/sections-trailing-func.test b/test/Shell/ObjectFile/Breakpad/sections-trailing-func.test
similarity index 100%
rename from lit/ObjectFile/Breakpad/sections-trailing-func.test
rename to test/Shell/ObjectFile/Breakpad/sections-trailing-func.test
diff --git a/lit/ObjectFile/Breakpad/sections.test b/test/Shell/ObjectFile/Breakpad/sections.test
similarity index 100%
rename from lit/ObjectFile/Breakpad/sections.test
rename to test/Shell/ObjectFile/Breakpad/sections.test
diff --git a/lit/ObjectFile/Breakpad/uuid-matching-mac.test b/test/Shell/ObjectFile/Breakpad/uuid-matching-mac.test
similarity index 100%
rename from lit/ObjectFile/Breakpad/uuid-matching-mac.test
rename to test/Shell/ObjectFile/Breakpad/uuid-matching-mac.test
diff --git a/lit/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf b/test/Shell/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf
similarity index 100%
rename from lit/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf
rename to test/Shell/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf
Binary files differ
diff --git a/lit/ObjectFile/ELF/Inputs/minidebuginfo-main.c b/test/Shell/ObjectFile/ELF/Inputs/minidebuginfo-main.c
similarity index 100%
rename from lit/ObjectFile/ELF/Inputs/minidebuginfo-main.c
rename to test/Shell/ObjectFile/ELF/Inputs/minidebuginfo-main.c
diff --git a/lit/ObjectFile/ELF/Inputs/netbsd-amd64.core b/test/Shell/ObjectFile/ELF/Inputs/netbsd-amd64.core
similarity index 100%
rename from lit/ObjectFile/ELF/Inputs/netbsd-amd64.core
rename to test/Shell/ObjectFile/ELF/Inputs/netbsd-amd64.core
Binary files differ
diff --git a/lit/ObjectFile/ELF/PT_LOAD-empty.yaml b/test/Shell/ObjectFile/ELF/PT_LOAD-empty.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/PT_LOAD-empty.yaml
rename to test/Shell/ObjectFile/ELF/PT_LOAD-empty.yaml
diff --git a/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml b/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
rename to test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
diff --git a/lit/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml b/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
rename to test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
diff --git a/lit/ObjectFile/ELF/PT_LOAD-overlap-section.yaml b/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
rename to test/Shell/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
diff --git a/lit/ObjectFile/ELF/PT_LOAD-overlap.yaml b/test/Shell/ObjectFile/ELF/PT_LOAD-overlap.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/PT_LOAD-overlap.yaml
rename to test/Shell/ObjectFile/ELF/PT_LOAD-overlap.yaml
diff --git a/lit/ObjectFile/ELF/PT_LOAD.yaml b/test/Shell/ObjectFile/ELF/PT_LOAD.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/PT_LOAD.yaml
rename to test/Shell/ObjectFile/ELF/PT_LOAD.yaml
diff --git a/lit/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml b/test/Shell/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
rename to test/Shell/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
diff --git a/lit/ObjectFile/ELF/aarch64-relocations.yaml b/test/Shell/ObjectFile/ELF/aarch64-relocations.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/aarch64-relocations.yaml
rename to test/Shell/ObjectFile/ELF/aarch64-relocations.yaml
diff --git a/lit/ObjectFile/ELF/base-address.yaml b/test/Shell/ObjectFile/ELF/base-address.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/base-address.yaml
rename to test/Shell/ObjectFile/ELF/base-address.yaml
diff --git a/lit/ObjectFile/ELF/basic-info.yaml b/test/Shell/ObjectFile/ELF/basic-info.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/basic-info.yaml
rename to test/Shell/ObjectFile/ELF/basic-info.yaml
diff --git a/lit/ObjectFile/ELF/build-id-case.yaml b/test/Shell/ObjectFile/ELF/build-id-case.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/build-id-case.yaml
rename to test/Shell/ObjectFile/ELF/build-id-case.yaml
diff --git a/lit/ObjectFile/ELF/compressed-sections.yaml b/test/Shell/ObjectFile/ELF/compressed-sections.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/compressed-sections.yaml
rename to test/Shell/ObjectFile/ELF/compressed-sections.yaml
diff --git a/lit/ObjectFile/ELF/duplicate-section.yaml b/test/Shell/ObjectFile/ELF/duplicate-section.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/duplicate-section.yaml
rename to test/Shell/ObjectFile/ELF/duplicate-section.yaml
diff --git a/lit/ObjectFile/ELF/gnu-debuglink.yaml b/test/Shell/ObjectFile/ELF/gnu-debuglink.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/gnu-debuglink.yaml
rename to test/Shell/ObjectFile/ELF/gnu-debuglink.yaml
diff --git a/lit/ObjectFile/ELF/many-sections.s b/test/Shell/ObjectFile/ELF/many-sections.s
similarity index 100%
rename from lit/ObjectFile/ELF/many-sections.s
rename to test/Shell/ObjectFile/ELF/many-sections.s
diff --git a/lit/ObjectFile/ELF/minidebuginfo-corrupt-xz.yaml b/test/Shell/ObjectFile/ELF/minidebuginfo-corrupt-xz.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/minidebuginfo-corrupt-xz.yaml
rename to test/Shell/ObjectFile/ELF/minidebuginfo-corrupt-xz.yaml
diff --git a/lit/ObjectFile/ELF/minidebuginfo-find-symbols.yaml b/test/Shell/ObjectFile/ELF/minidebuginfo-find-symbols.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/minidebuginfo-find-symbols.yaml
rename to test/Shell/ObjectFile/ELF/minidebuginfo-find-symbols.yaml
diff --git a/lit/ObjectFile/ELF/minidebuginfo-no-lzma.yaml b/test/Shell/ObjectFile/ELF/minidebuginfo-no-lzma.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/minidebuginfo-no-lzma.yaml
rename to test/Shell/ObjectFile/ELF/minidebuginfo-no-lzma.yaml
diff --git a/lit/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test b/test/Shell/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test
similarity index 100%
rename from lit/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test
rename to test/Shell/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test
diff --git a/lit/ObjectFile/ELF/netbsd-core-amd64.test b/test/Shell/ObjectFile/ELF/netbsd-core-amd64.test
similarity index 100%
rename from lit/ObjectFile/ELF/netbsd-core-amd64.test
rename to test/Shell/ObjectFile/ELF/netbsd-core-amd64.test
diff --git a/lit/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml b/test/Shell/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml
rename to test/Shell/ObjectFile/ELF/netbsd-exec-8.99.30-amd64.yaml
diff --git a/lit/ObjectFile/ELF/section-addresses.yaml b/test/Shell/ObjectFile/ELF/section-addresses.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/section-addresses.yaml
rename to test/Shell/ObjectFile/ELF/section-addresses.yaml
diff --git a/lit/ObjectFile/ELF/section-overlap.yaml b/test/Shell/ObjectFile/ELF/section-overlap.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/section-overlap.yaml
rename to test/Shell/ObjectFile/ELF/section-overlap.yaml
diff --git a/lit/ObjectFile/ELF/section-permissions.yaml b/test/Shell/ObjectFile/ELF/section-permissions.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/section-permissions.yaml
rename to test/Shell/ObjectFile/ELF/section-permissions.yaml
diff --git a/lit/ObjectFile/ELF/section-types-edgecases.yaml b/test/Shell/ObjectFile/ELF/section-types-edgecases.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/section-types-edgecases.yaml
rename to test/Shell/ObjectFile/ELF/section-types-edgecases.yaml
diff --git a/lit/ObjectFile/ELF/section-types.yaml b/test/Shell/ObjectFile/ELF/section-types.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/section-types.yaml
rename to test/Shell/ObjectFile/ELF/section-types.yaml
diff --git a/lit/ObjectFile/ELF/short-build-id.yaml b/test/Shell/ObjectFile/ELF/short-build-id.yaml
similarity index 100%
rename from lit/ObjectFile/ELF/short-build-id.yaml
rename to test/Shell/ObjectFile/ELF/short-build-id.yaml
diff --git a/lit/ObjectFile/MachO/lc_build_version.yaml b/test/Shell/ObjectFile/MachO/lc_build_version.yaml
similarity index 100%
rename from lit/ObjectFile/MachO/lc_build_version.yaml
rename to test/Shell/ObjectFile/MachO/lc_build_version.yaml
diff --git a/lit/ObjectFile/MachO/lc_build_version_notools.yaml b/test/Shell/ObjectFile/MachO/lc_build_version_notools.yaml
similarity index 100%
rename from lit/ObjectFile/MachO/lc_build_version_notools.yaml
rename to test/Shell/ObjectFile/MachO/lc_build_version_notools.yaml
diff --git a/lit/ObjectFile/MachO/lc_version_min.yaml b/test/Shell/ObjectFile/MachO/lc_version_min.yaml
similarity index 100%
rename from lit/ObjectFile/MachO/lc_version_min.yaml
rename to test/Shell/ObjectFile/MachO/lc_version_min.yaml
diff --git a/lit/ObjectFile/MachO/subsections.yaml b/test/Shell/ObjectFile/MachO/subsections.yaml
similarity index 100%
rename from lit/ObjectFile/MachO/subsections.yaml
rename to test/Shell/ObjectFile/MachO/subsections.yaml
diff --git a/lit/ObjectFile/MachO/symtab.yaml b/test/Shell/ObjectFile/MachO/symtab.yaml
similarity index 100%
rename from lit/ObjectFile/MachO/symtab.yaml
rename to test/Shell/ObjectFile/MachO/symtab.yaml
diff --git a/lit/ObjectFile/PECOFF/basic-info-arm.yaml b/test/Shell/ObjectFile/PECOFF/basic-info-arm.yaml
similarity index 100%
rename from lit/ObjectFile/PECOFF/basic-info-arm.yaml
rename to test/Shell/ObjectFile/PECOFF/basic-info-arm.yaml
diff --git a/lit/ObjectFile/PECOFF/basic-info-arm64.yaml b/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml
similarity index 100%
rename from lit/ObjectFile/PECOFF/basic-info-arm64.yaml
rename to test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml
diff --git a/lit/ObjectFile/PECOFF/basic-info.yaml b/test/Shell/ObjectFile/PECOFF/basic-info.yaml
similarity index 100%
rename from lit/ObjectFile/PECOFF/basic-info.yaml
rename to test/Shell/ObjectFile/PECOFF/basic-info.yaml
diff --git a/lit/ObjectFile/PECOFF/dep-modules.yaml b/test/Shell/ObjectFile/PECOFF/dep-modules.yaml
similarity index 100%
rename from lit/ObjectFile/PECOFF/dep-modules.yaml
rename to test/Shell/ObjectFile/PECOFF/dep-modules.yaml
diff --git a/lit/ObjectFile/PECOFF/export-dllfunc.yaml b/test/Shell/ObjectFile/PECOFF/export-dllfunc.yaml
similarity index 100%
rename from lit/ObjectFile/PECOFF/export-dllfunc.yaml
rename to test/Shell/ObjectFile/PECOFF/export-dllfunc.yaml
diff --git a/lit/ObjectFile/PECOFF/lit.local.cfg b/test/Shell/ObjectFile/PECOFF/lit.local.cfg
similarity index 100%
rename from lit/ObjectFile/PECOFF/lit.local.cfg
rename to test/Shell/ObjectFile/PECOFF/lit.local.cfg
diff --git a/lit/ObjectFile/PECOFF/sections-names.yaml b/test/Shell/ObjectFile/PECOFF/sections-names.yaml
similarity index 100%
rename from lit/ObjectFile/PECOFF/sections-names.yaml
rename to test/Shell/ObjectFile/PECOFF/sections-names.yaml
diff --git a/lit/ObjectFile/PECOFF/subsections.yaml b/test/Shell/ObjectFile/PECOFF/subsections.yaml
similarity index 100%
rename from lit/ObjectFile/PECOFF/subsections.yaml
rename to test/Shell/ObjectFile/PECOFF/subsections.yaml
diff --git a/lit/ObjectFile/PECOFF/uuid.yaml b/test/Shell/ObjectFile/PECOFF/uuid.yaml
similarity index 100%
rename from lit/ObjectFile/PECOFF/uuid.yaml
rename to test/Shell/ObjectFile/PECOFF/uuid.yaml
diff --git a/lit/ObjectFile/lit.local.cfg b/test/Shell/ObjectFile/lit.local.cfg
similarity index 100%
rename from lit/ObjectFile/lit.local.cfg
rename to test/Shell/ObjectFile/lit.local.cfg
diff --git a/lit/Process/Inputs/env.cpp b/test/Shell/Process/Inputs/env.cpp
similarity index 100%
rename from lit/Process/Inputs/env.cpp
rename to test/Shell/Process/Inputs/env.cpp
diff --git a/lit/Process/TestEnvironment.test b/test/Shell/Process/TestEnvironment.test
similarity index 100%
rename from lit/Process/TestEnvironment.test
rename to test/Shell/Process/TestEnvironment.test
diff --git a/lit/Process/Windows/exception_access_violation.cpp b/test/Shell/Process/Windows/exception_access_violation.cpp
similarity index 100%
rename from lit/Process/Windows/exception_access_violation.cpp
rename to test/Shell/Process/Windows/exception_access_violation.cpp
diff --git a/lit/Python/crashlog.test b/test/Shell/Python/crashlog.test
similarity index 97%
rename from lit/Python/crashlog.test
rename to test/Shell/Python/crashlog.test
index 7ea7c0b..24d72ea 100644
--- a/lit/Python/crashlog.test
+++ b/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/lit/Quit/TestQuitExitCode-30.test b/test/Shell/Quit/TestQuitExitCode-30.test
similarity index 100%
rename from lit/Quit/TestQuitExitCode-30.test
rename to test/Shell/Quit/TestQuitExitCode-30.test
diff --git a/lit/Quit/TestQuitExitCode0.test b/test/Shell/Quit/TestQuitExitCode0.test
similarity index 100%
rename from lit/Quit/TestQuitExitCode0.test
rename to test/Shell/Quit/TestQuitExitCode0.test
diff --git a/lit/Quit/TestQuitExitCode30.test b/test/Shell/Quit/TestQuitExitCode30.test
similarity index 100%
rename from lit/Quit/TestQuitExitCode30.test
rename to test/Shell/Quit/TestQuitExitCode30.test
diff --git a/lit/Quit/TestQuitExitCodeHex0.test b/test/Shell/Quit/TestQuitExitCodeHex0.test
similarity index 100%
rename from lit/Quit/TestQuitExitCodeHex0.test
rename to test/Shell/Quit/TestQuitExitCodeHex0.test
diff --git a/lit/Quit/TestQuitExitCodeHexA.test b/test/Shell/Quit/TestQuitExitCodeHexA.test
similarity index 100%
rename from lit/Quit/TestQuitExitCodeHexA.test
rename to test/Shell/Quit/TestQuitExitCodeHexA.test
diff --git a/lit/Quit/TestQuitExitCodeImplicit0.test b/test/Shell/Quit/TestQuitExitCodeImplicit0.test
similarity index 100%
rename from lit/Quit/TestQuitExitCodeImplicit0.test
rename to test/Shell/Quit/TestQuitExitCodeImplicit0.test
diff --git a/lit/Quit/TestQuitExitCodeNonInt.test b/test/Shell/Quit/TestQuitExitCodeNonInt.test
similarity index 100%
rename from lit/Quit/TestQuitExitCodeNonInt.test
rename to test/Shell/Quit/TestQuitExitCodeNonInt.test
diff --git a/lit/Quit/TestQuitExitCodeTooManyArgs.test b/test/Shell/Quit/TestQuitExitCodeTooManyArgs.test
similarity index 100%
rename from lit/Quit/TestQuitExitCodeTooManyArgs.test
rename to test/Shell/Quit/TestQuitExitCodeTooManyArgs.test
diff --git a/lit/Quit/expect_exit_code.py b/test/Shell/Quit/expect_exit_code.py
similarity index 100%
rename from lit/Quit/expect_exit_code.py
rename to test/Shell/Quit/expect_exit_code.py
diff --git a/lit/Register/Inputs/x86-64-gp-read.cpp b/test/Shell/Register/Inputs/x86-64-gp-read.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-64-gp-read.cpp
rename to test/Shell/Register/Inputs/x86-64-gp-read.cpp
diff --git a/lit/Register/Inputs/x86-64-gp-write.cpp b/test/Shell/Register/Inputs/x86-64-gp-write.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-64-gp-write.cpp
rename to test/Shell/Register/Inputs/x86-64-gp-write.cpp
diff --git a/lit/Register/Inputs/x86-64-read.cpp b/test/Shell/Register/Inputs/x86-64-read.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-64-read.cpp
rename to test/Shell/Register/Inputs/x86-64-read.cpp
diff --git a/lit/Register/Inputs/x86-64-write.cpp b/test/Shell/Register/Inputs/x86-64-write.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-64-write.cpp
rename to test/Shell/Register/Inputs/x86-64-write.cpp
diff --git a/lit/Register/Inputs/x86-gp-read.cpp b/test/Shell/Register/Inputs/x86-gp-read.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-gp-read.cpp
rename to test/Shell/Register/Inputs/x86-gp-read.cpp
diff --git a/lit/Register/Inputs/x86-gp-write.cpp b/test/Shell/Register/Inputs/x86-gp-write.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-gp-write.cpp
rename to test/Shell/Register/Inputs/x86-gp-write.cpp
diff --git a/lit/Register/Inputs/x86-mm-xmm-read.cpp b/test/Shell/Register/Inputs/x86-mm-xmm-read.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-mm-xmm-read.cpp
rename to test/Shell/Register/Inputs/x86-mm-xmm-read.cpp
diff --git a/lit/Register/Inputs/x86-mm-xmm-write.cpp b/test/Shell/Register/Inputs/x86-mm-xmm-write.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-mm-xmm-write.cpp
rename to test/Shell/Register/Inputs/x86-mm-xmm-write.cpp
diff --git a/lit/Register/Inputs/x86-ymm-read.cpp b/test/Shell/Register/Inputs/x86-ymm-read.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-ymm-read.cpp
rename to test/Shell/Register/Inputs/x86-ymm-read.cpp
diff --git a/lit/Register/Inputs/x86-ymm-write.cpp b/test/Shell/Register/Inputs/x86-ymm-write.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-ymm-write.cpp
rename to test/Shell/Register/Inputs/x86-ymm-write.cpp
diff --git a/lit/Register/Inputs/x86-zmm-read.cpp b/test/Shell/Register/Inputs/x86-zmm-read.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-zmm-read.cpp
rename to test/Shell/Register/Inputs/x86-zmm-read.cpp
diff --git a/lit/Register/Inputs/x86-zmm-write.cpp b/test/Shell/Register/Inputs/x86-zmm-write.cpp
similarity index 100%
rename from lit/Register/Inputs/x86-zmm-write.cpp
rename to test/Shell/Register/Inputs/x86-zmm-write.cpp
diff --git a/lit/Register/x86-64-gp-read.test b/test/Shell/Register/x86-64-gp-read.test
similarity index 100%
rename from lit/Register/x86-64-gp-read.test
rename to test/Shell/Register/x86-64-gp-read.test
diff --git a/lit/Register/x86-64-gp-write.test b/test/Shell/Register/x86-64-gp-write.test
similarity index 100%
rename from lit/Register/x86-64-gp-write.test
rename to test/Shell/Register/x86-64-gp-write.test
diff --git a/lit/Register/x86-64-read.test b/test/Shell/Register/x86-64-read.test
similarity index 100%
rename from lit/Register/x86-64-read.test
rename to test/Shell/Register/x86-64-read.test
diff --git a/lit/Register/x86-64-write.test b/test/Shell/Register/x86-64-write.test
similarity index 100%
rename from lit/Register/x86-64-write.test
rename to test/Shell/Register/x86-64-write.test
diff --git a/lit/Register/x86-64-xmm16-read.test b/test/Shell/Register/x86-64-xmm16-read.test
similarity index 100%
rename from lit/Register/x86-64-xmm16-read.test
rename to test/Shell/Register/x86-64-xmm16-read.test
diff --git a/lit/Register/x86-64-xmm16-write.test b/test/Shell/Register/x86-64-xmm16-write.test
similarity index 100%
rename from lit/Register/x86-64-xmm16-write.test
rename to test/Shell/Register/x86-64-xmm16-write.test
diff --git a/lit/Register/x86-64-ymm-read.test b/test/Shell/Register/x86-64-ymm-read.test
similarity index 100%
rename from lit/Register/x86-64-ymm-read.test
rename to test/Shell/Register/x86-64-ymm-read.test
diff --git a/lit/Register/x86-64-ymm-write.test b/test/Shell/Register/x86-64-ymm-write.test
similarity index 100%
rename from lit/Register/x86-64-ymm-write.test
rename to test/Shell/Register/x86-64-ymm-write.test
diff --git a/lit/Register/x86-64-ymm16-read.test b/test/Shell/Register/x86-64-ymm16-read.test
similarity index 100%
rename from lit/Register/x86-64-ymm16-read.test
rename to test/Shell/Register/x86-64-ymm16-read.test
diff --git a/lit/Register/x86-64-ymm16-write.test b/test/Shell/Register/x86-64-ymm16-write.test
similarity index 100%
rename from lit/Register/x86-64-ymm16-write.test
rename to test/Shell/Register/x86-64-ymm16-write.test
diff --git a/lit/Register/x86-64-zmm-read.test b/test/Shell/Register/x86-64-zmm-read.test
similarity index 100%
rename from lit/Register/x86-64-zmm-read.test
rename to test/Shell/Register/x86-64-zmm-read.test
diff --git a/lit/Register/x86-64-zmm-write.test b/test/Shell/Register/x86-64-zmm-write.test
similarity index 100%
rename from lit/Register/x86-64-zmm-write.test
rename to test/Shell/Register/x86-64-zmm-write.test
diff --git a/lit/Register/x86-gp-read.test b/test/Shell/Register/x86-gp-read.test
similarity index 100%
rename from lit/Register/x86-gp-read.test
rename to test/Shell/Register/x86-gp-read.test
diff --git a/lit/Register/x86-gp-write.test b/test/Shell/Register/x86-gp-write.test
similarity index 100%
rename from lit/Register/x86-gp-write.test
rename to test/Shell/Register/x86-gp-write.test
diff --git a/lit/Register/x86-mm-xmm-read.test b/test/Shell/Register/x86-mm-xmm-read.test
similarity index 100%
rename from lit/Register/x86-mm-xmm-read.test
rename to test/Shell/Register/x86-mm-xmm-read.test
diff --git a/lit/Register/x86-mm-xmm-write.test b/test/Shell/Register/x86-mm-xmm-write.test
similarity index 100%
rename from lit/Register/x86-mm-xmm-write.test
rename to test/Shell/Register/x86-mm-xmm-write.test
diff --git a/lit/Register/x86-ymm-read.test b/test/Shell/Register/x86-ymm-read.test
similarity index 100%
rename from lit/Register/x86-ymm-read.test
rename to test/Shell/Register/x86-ymm-read.test
diff --git a/lit/Register/x86-ymm-write.test b/test/Shell/Register/x86-ymm-write.test
similarity index 100%
rename from lit/Register/x86-ymm-write.test
rename to test/Shell/Register/x86-ymm-write.test
diff --git a/lit/Register/x86-zmm-read.test b/test/Shell/Register/x86-zmm-read.test
similarity index 100%
rename from lit/Register/x86-zmm-read.test
rename to test/Shell/Register/x86-zmm-read.test
diff --git a/lit/Register/x86-zmm-write.test b/test/Shell/Register/x86-zmm-write.test
similarity index 100%
rename from lit/Register/x86-zmm-write.test
rename to test/Shell/Register/x86-zmm-write.test
diff --git a/lit/Reproducer/Functionalities/Inputs/DataFormatter.in b/test/Shell/Reproducer/Functionalities/Inputs/DataFormatter.in
similarity index 100%
rename from lit/Reproducer/Functionalities/Inputs/DataFormatter.in
rename to test/Shell/Reproducer/Functionalities/Inputs/DataFormatter.in
diff --git a/lit/Reproducer/Functionalities/Inputs/foo.cpp b/test/Shell/Reproducer/Functionalities/Inputs/foo.cpp
similarity index 100%
rename from lit/Reproducer/Functionalities/Inputs/foo.cpp
rename to test/Shell/Reproducer/Functionalities/Inputs/foo.cpp
diff --git a/lit/Reproducer/Functionalities/Inputs/stepping.c b/test/Shell/Reproducer/Functionalities/Inputs/stepping.c
similarity index 100%
rename from lit/Reproducer/Functionalities/Inputs/stepping.c
rename to test/Shell/Reproducer/Functionalities/Inputs/stepping.c
diff --git a/lit/Reproducer/Functionalities/TestDataFormatter.test b/test/Shell/Reproducer/Functionalities/TestDataFormatter.test
similarity index 100%
rename from lit/Reproducer/Functionalities/TestDataFormatter.test
rename to test/Shell/Reproducer/Functionalities/TestDataFormatter.test
diff --git a/lit/Reproducer/Functionalities/TestImageList.test b/test/Shell/Reproducer/Functionalities/TestImageList.test
similarity index 100%
rename from lit/Reproducer/Functionalities/TestImageList.test
rename to test/Shell/Reproducer/Functionalities/TestImageList.test
diff --git a/lit/Reproducer/Functionalities/TestStepping.test b/test/Shell/Reproducer/Functionalities/TestStepping.test
similarity index 100%
rename from lit/Reproducer/Functionalities/TestStepping.test
rename to test/Shell/Reproducer/Functionalities/TestStepping.test
diff --git a/lit/Reproducer/Inputs/FileCapture.in b/test/Shell/Reproducer/Inputs/FileCapture.in
similarity index 100%
rename from lit/Reproducer/Inputs/FileCapture.in
rename to test/Shell/Reproducer/Inputs/FileCapture.in
diff --git a/lit/Reproducer/Inputs/GDBRemoteCapture.in b/test/Shell/Reproducer/Inputs/GDBRemoteCapture.in
similarity index 100%
rename from lit/Reproducer/Inputs/GDBRemoteCapture.in
rename to test/Shell/Reproducer/Inputs/GDBRemoteCapture.in
diff --git a/lit/Reproducer/Inputs/simple.c b/test/Shell/Reproducer/Inputs/simple.c
similarity index 100%
rename from lit/Reproducer/Inputs/simple.c
rename to test/Shell/Reproducer/Inputs/simple.c
diff --git a/lit/Reproducer/Modules/Inputs/Bar.h b/test/Shell/Reproducer/Modules/Inputs/Bar.h
similarity index 100%
rename from lit/Reproducer/Modules/Inputs/Bar.h
rename to test/Shell/Reproducer/Modules/Inputs/Bar.h
diff --git a/lit/Reproducer/Modules/Inputs/Foo.h b/test/Shell/Reproducer/Modules/Inputs/Foo.h
similarity index 100%
rename from lit/Reproducer/Modules/Inputs/Foo.h
rename to test/Shell/Reproducer/Modules/Inputs/Foo.h
diff --git a/lit/Reproducer/Modules/Inputs/ModuleCXX.in b/test/Shell/Reproducer/Modules/Inputs/ModuleCXX.in
similarity index 100%
rename from lit/Reproducer/Modules/Inputs/ModuleCXX.in
rename to test/Shell/Reproducer/Modules/Inputs/ModuleCXX.in
diff --git a/lit/Reproducer/Modules/Inputs/main.cpp b/test/Shell/Reproducer/Modules/Inputs/main.cpp
similarity index 100%
rename from lit/Reproducer/Modules/Inputs/main.cpp
rename to test/Shell/Reproducer/Modules/Inputs/main.cpp
diff --git a/lit/Reproducer/Modules/Inputs/module.modulemap b/test/Shell/Reproducer/Modules/Inputs/module.modulemap
similarity index 100%
rename from lit/Reproducer/Modules/Inputs/module.modulemap
rename to test/Shell/Reproducer/Modules/Inputs/module.modulemap
diff --git a/lit/Reproducer/Modules/TestModuleCXX.test b/test/Shell/Reproducer/Modules/TestModuleCXX.test
similarity index 100%
rename from lit/Reproducer/Modules/TestModuleCXX.test
rename to test/Shell/Reproducer/Modules/TestModuleCXX.test
diff --git a/lit/Reproducer/TestDriverOptions.test b/test/Shell/Reproducer/TestDriverOptions.test
similarity index 100%
rename from lit/Reproducer/TestDriverOptions.test
rename to test/Shell/Reproducer/TestDriverOptions.test
diff --git a/lit/Reproducer/TestDump.test b/test/Shell/Reproducer/TestDump.test
similarity index 100%
rename from lit/Reproducer/TestDump.test
rename to test/Shell/Reproducer/TestDump.test
diff --git a/lit/Reproducer/TestFileRepro.test b/test/Shell/Reproducer/TestFileRepro.test
similarity index 100%
rename from lit/Reproducer/TestFileRepro.test
rename to test/Shell/Reproducer/TestFileRepro.test
diff --git a/lit/Reproducer/TestGDBRemoteRepro.test b/test/Shell/Reproducer/TestGDBRemoteRepro.test
similarity index 100%
rename from lit/Reproducer/TestGDBRemoteRepro.test
rename to test/Shell/Reproducer/TestGDBRemoteRepro.test
diff --git a/lit/Reproducer/TestRelativePath.test b/test/Shell/Reproducer/TestRelativePath.test
similarity index 100%
rename from lit/Reproducer/TestRelativePath.test
rename to test/Shell/Reproducer/TestRelativePath.test
diff --git a/lit/Reproducer/TestReuseDirectory.test b/test/Shell/Reproducer/TestReuseDirectory.test
similarity index 100%
rename from lit/Reproducer/TestReuseDirectory.test
rename to test/Shell/Reproducer/TestReuseDirectory.test
diff --git a/lit/Reproducer/TestSynchronous.test b/test/Shell/Reproducer/TestSynchronous.test
similarity index 100%
rename from lit/Reproducer/TestSynchronous.test
rename to test/Shell/Reproducer/TestSynchronous.test
diff --git a/lit/Settings/Inputs/DontStopCommandSource.in b/test/Shell/Settings/Inputs/DontStopCommandSource.in
similarity index 100%
rename from lit/Settings/Inputs/DontStopCommandSource.in
rename to test/Shell/Settings/Inputs/DontStopCommandSource.in
diff --git a/lit/Settings/Inputs/EchoCommandsAll.out b/test/Shell/Settings/Inputs/EchoCommandsAll.out
similarity index 100%
rename from lit/Settings/Inputs/EchoCommandsAll.out
rename to test/Shell/Settings/Inputs/EchoCommandsAll.out
diff --git a/lit/Settings/Inputs/EchoCommandsNoComments.out b/test/Shell/Settings/Inputs/EchoCommandsNoComments.out
similarity index 100%
rename from lit/Settings/Inputs/EchoCommandsNoComments.out
rename to test/Shell/Settings/Inputs/EchoCommandsNoComments.out
diff --git a/lit/Settings/Inputs/EchoCommandsNone.out b/test/Shell/Settings/Inputs/EchoCommandsNone.out
similarity index 100%
rename from lit/Settings/Inputs/EchoCommandsNone.out
rename to test/Shell/Settings/Inputs/EchoCommandsNone.out
diff --git a/lit/Settings/Inputs/EchoCommandsQuiet.out b/test/Shell/Settings/Inputs/EchoCommandsQuiet.out
similarity index 100%
rename from lit/Settings/Inputs/EchoCommandsQuiet.out
rename to test/Shell/Settings/Inputs/EchoCommandsQuiet.out
diff --git a/lit/Settings/Inputs/EchoCommandsTest.in b/test/Shell/Settings/Inputs/EchoCommandsTest.in
similarity index 100%
rename from lit/Settings/Inputs/EchoCommandsTest.in
rename to test/Shell/Settings/Inputs/EchoCommandsTest.in
diff --git a/lit/Settings/Inputs/StopCommandSource.in b/test/Shell/Settings/Inputs/StopCommandSource.in
similarity index 100%
rename from lit/Settings/Inputs/StopCommandSource.in
rename to test/Shell/Settings/Inputs/StopCommandSource.in
diff --git a/lit/Settings/Inputs/main.c b/test/Shell/Settings/Inputs/main.c
similarity index 100%
rename from lit/Settings/Inputs/main.c
rename to test/Shell/Settings/Inputs/main.c
diff --git a/lit/Settings/TestDisableColor.test b/test/Shell/Settings/TestDisableColor.test
similarity index 100%
rename from lit/Settings/TestDisableColor.test
rename to test/Shell/Settings/TestDisableColor.test
diff --git a/lit/Settings/TestDisassemblyFormat.test b/test/Shell/Settings/TestDisassemblyFormat.test
similarity index 100%
rename from lit/Settings/TestDisassemblyFormat.test
rename to test/Shell/Settings/TestDisassemblyFormat.test
diff --git a/lit/Settings/TestEchoCommands.test b/test/Shell/Settings/TestEchoCommands.test
similarity index 100%
rename from lit/Settings/TestEchoCommands.test
rename to test/Shell/Settings/TestEchoCommands.test
diff --git a/lit/Settings/TestFrameFormatColor.test b/test/Shell/Settings/TestFrameFormatColor.test
similarity index 100%
rename from lit/Settings/TestFrameFormatColor.test
rename to test/Shell/Settings/TestFrameFormatColor.test
diff --git a/lit/Settings/TestFrameFormatNoColor.test b/test/Shell/Settings/TestFrameFormatNoColor.test
similarity index 100%
rename from lit/Settings/TestFrameFormatNoColor.test
rename to test/Shell/Settings/TestFrameFormatNoColor.test
diff --git a/lit/Settings/TestModuleCacheSanity.test b/test/Shell/Settings/TestModuleCacheSanity.test
similarity index 100%
rename from lit/Settings/TestModuleCacheSanity.test
rename to test/Shell/Settings/TestModuleCacheSanity.test
diff --git a/lit/Settings/TestSettingsSet.test b/test/Shell/Settings/TestSettingsSet.test
similarity index 100%
rename from lit/Settings/TestSettingsSet.test
rename to test/Shell/Settings/TestSettingsSet.test
diff --git a/lit/Settings/TestSettingsWrite.test b/test/Shell/Settings/TestSettingsWrite.test
similarity index 100%
rename from lit/Settings/TestSettingsWrite.test
rename to test/Shell/Settings/TestSettingsWrite.test
diff --git a/lit/Settings/TestStopCommandSourceOnError.test b/test/Shell/Settings/TestStopCommandSourceOnError.test
similarity index 100%
rename from lit/Settings/TestStopCommandSourceOnError.test
rename to test/Shell/Settings/TestStopCommandSourceOnError.test
diff --git a/lit/SymbolFile/Breakpad/Inputs/basic-elf.yaml b/test/Shell/SymbolFile/Breakpad/Inputs/basic-elf.yaml
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/basic-elf.yaml
rename to test/Shell/SymbolFile/Breakpad/Inputs/basic-elf.yaml
diff --git a/lit/SymbolFile/Breakpad/Inputs/basic-macho.yaml b/test/Shell/SymbolFile/Breakpad/Inputs/basic-macho.yaml
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/basic-macho.yaml
rename to test/Shell/SymbolFile/Breakpad/Inputs/basic-macho.yaml
diff --git a/lit/SymbolFile/Breakpad/Inputs/line-table-discontinuous-file-ids.syms b/test/Shell/SymbolFile/Breakpad/Inputs/line-table-discontinuous-file-ids.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/line-table-discontinuous-file-ids.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/line-table-discontinuous-file-ids.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/line-table-edgecases.syms b/test/Shell/SymbolFile/Breakpad/Inputs/line-table-edgecases.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/line-table-edgecases.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/line-table-edgecases.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/line-table-missing-file.syms b/test/Shell/SymbolFile/Breakpad/Inputs/line-table-missing-file.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/line-table-missing-file.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/line-table-missing-file.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/line-table-mixed-path-styles.syms b/test/Shell/SymbolFile/Breakpad/Inputs/line-table-mixed-path-styles.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/line-table-mixed-path-styles.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/line-table-mixed-path-styles.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/line-table.syms b/test/Shell/SymbolFile/Breakpad/Inputs/line-table.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/line-table.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/line-table.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.syms b/test/Shell/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.yaml b/test/Shell/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.yaml
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.yaml
rename to test/Shell/SymbolFile/Breakpad/Inputs/stack-cfi-parsing.yaml
diff --git a/lit/SymbolFile/Breakpad/Inputs/symtab-macho.syms b/test/Shell/SymbolFile/Breakpad/Inputs/symtab-macho.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/symtab-macho.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/symtab-macho.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/symtab.syms b/test/Shell/SymbolFile/Breakpad/Inputs/symtab.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/symtab.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/symtab.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/unwind-via-raSearch.syms b/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-raSearch.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/unwind-via-raSearch.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-raSearch.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.syms b/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.yaml b/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.yaml
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.yaml
rename to test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-cfi.yaml
diff --git a/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.syms b/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.syms
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.syms
rename to test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.syms
diff --git a/lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.yaml b/test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.yaml
similarity index 100%
rename from lit/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.yaml
rename to test/Shell/SymbolFile/Breakpad/Inputs/unwind-via-stack-win.yaml
diff --git a/lit/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test b/test/Shell/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test
rename to test/Shell/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test
diff --git a/lit/SymbolFile/Breakpad/line-table-edgecases.test b/test/Shell/SymbolFile/Breakpad/line-table-edgecases.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/line-table-edgecases.test
rename to test/Shell/SymbolFile/Breakpad/line-table-edgecases.test
diff --git a/lit/SymbolFile/Breakpad/line-table-missing-file.test b/test/Shell/SymbolFile/Breakpad/line-table-missing-file.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/line-table-missing-file.test
rename to test/Shell/SymbolFile/Breakpad/line-table-missing-file.test
diff --git a/lit/SymbolFile/Breakpad/line-table-mixed-path-styles.test b/test/Shell/SymbolFile/Breakpad/line-table-mixed-path-styles.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/line-table-mixed-path-styles.test
rename to test/Shell/SymbolFile/Breakpad/line-table-mixed-path-styles.test
diff --git a/lit/SymbolFile/Breakpad/line-table.test b/test/Shell/SymbolFile/Breakpad/line-table.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/line-table.test
rename to test/Shell/SymbolFile/Breakpad/line-table.test
diff --git a/lit/SymbolFile/Breakpad/stack-cfi-parsing.test b/test/Shell/SymbolFile/Breakpad/stack-cfi-parsing.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/stack-cfi-parsing.test
rename to test/Shell/SymbolFile/Breakpad/stack-cfi-parsing.test
diff --git a/lit/SymbolFile/Breakpad/symtab-macho.test b/test/Shell/SymbolFile/Breakpad/symtab-macho.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/symtab-macho.test
rename to test/Shell/SymbolFile/Breakpad/symtab-macho.test
diff --git a/lit/SymbolFile/Breakpad/symtab.test b/test/Shell/SymbolFile/Breakpad/symtab.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/symtab.test
rename to test/Shell/SymbolFile/Breakpad/symtab.test
diff --git a/lit/SymbolFile/Breakpad/unwind-via-raSearch.test b/test/Shell/SymbolFile/Breakpad/unwind-via-raSearch.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/unwind-via-raSearch.test
rename to test/Shell/SymbolFile/Breakpad/unwind-via-raSearch.test
diff --git a/lit/SymbolFile/Breakpad/unwind-via-stack-cfi.test b/test/Shell/SymbolFile/Breakpad/unwind-via-stack-cfi.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/unwind-via-stack-cfi.test
rename to test/Shell/SymbolFile/Breakpad/unwind-via-stack-cfi.test
diff --git a/lit/SymbolFile/Breakpad/unwind-via-stack-win.test b/test/Shell/SymbolFile/Breakpad/unwind-via-stack-win.test
similarity index 100%
rename from lit/SymbolFile/Breakpad/unwind-via-stack-win.test
rename to test/Shell/SymbolFile/Breakpad/unwind-via-stack-win.test
diff --git a/lit/SymbolFile/DWARF/Inputs/debug-line-basic.script b/test/Shell/SymbolFile/DWARF/Inputs/debug-line-basic.script
similarity index 100%
rename from lit/SymbolFile/DWARF/Inputs/debug-line-basic.script
rename to test/Shell/SymbolFile/DWARF/Inputs/debug-line-basic.script
diff --git a/lit/SymbolFile/DWARF/Inputs/debug-types-basic.cpp b/test/Shell/SymbolFile/DWARF/Inputs/debug-types-basic.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/Inputs/debug-types-basic.cpp
rename to test/Shell/SymbolFile/DWARF/Inputs/debug-types-basic.cpp
diff --git a/lit/SymbolFile/DWARF/Inputs/debug-types-expressions.cpp b/test/Shell/SymbolFile/DWARF/Inputs/debug-types-expressions.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/Inputs/debug-types-expressions.cpp
rename to test/Shell/SymbolFile/DWARF/Inputs/debug-types-expressions.cpp
diff --git a/lit/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit b/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
similarity index 100%
rename from lit/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
rename to test/Shell/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
diff --git a/lit/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit b/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit
similarity index 100%
rename from lit/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit
rename to test/Shell/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit
diff --git a/lit/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit b/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit
similarity index 100%
rename from lit/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit
rename to test/Shell/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit
diff --git a/lit/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp b/test/Shell/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp
rename to test/Shell/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp
diff --git a/lit/SymbolFile/DWARF/apple-index-is-used.cpp b/test/Shell/SymbolFile/DWARF/apple-index-is-used.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/apple-index-is-used.cpp
rename to test/Shell/SymbolFile/DWARF/apple-index-is-used.cpp
diff --git a/lit/SymbolFile/DWARF/array-sizes.s b/test/Shell/SymbolFile/DWARF/array-sizes.s
similarity index 100%
rename from lit/SymbolFile/DWARF/array-sizes.s
rename to test/Shell/SymbolFile/DWARF/array-sizes.s
diff --git a/lit/SymbolFile/DWARF/childless-compile-unit.s b/test/Shell/SymbolFile/DWARF/childless-compile-unit.s
similarity index 100%
rename from lit/SymbolFile/DWARF/childless-compile-unit.s
rename to test/Shell/SymbolFile/DWARF/childless-compile-unit.s
diff --git a/lit/SymbolFile/DWARF/compilercontext.ll b/test/Shell/SymbolFile/DWARF/compilercontext.ll
similarity index 100%
rename from lit/SymbolFile/DWARF/compilercontext.ll
rename to test/Shell/SymbolFile/DWARF/compilercontext.ll
diff --git a/lit/SymbolFile/DWARF/debug-line-basic.s b/test/Shell/SymbolFile/DWARF/debug-line-basic.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-line-basic.s
rename to test/Shell/SymbolFile/DWARF/debug-line-basic.s
diff --git a/lit/SymbolFile/DWARF/debug-names-compressed.cpp b/test/Shell/SymbolFile/DWARF/debug-names-compressed.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-names-compressed.cpp
rename to test/Shell/SymbolFile/DWARF/debug-names-compressed.cpp
diff --git a/lit/SymbolFile/DWARF/debug-types-address-ranges.s b/test/Shell/SymbolFile/DWARF/debug-types-address-ranges.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-types-address-ranges.s
rename to test/Shell/SymbolFile/DWARF/debug-types-address-ranges.s
diff --git a/lit/SymbolFile/DWARF/debug-types-basic.test b/test/Shell/SymbolFile/DWARF/debug-types-basic.test
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-types-basic.test
rename to test/Shell/SymbolFile/DWARF/debug-types-basic.test
diff --git a/lit/SymbolFile/DWARF/debug-types-dwarf5.s b/test/Shell/SymbolFile/DWARF/debug-types-dwarf5.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-types-dwarf5.s
rename to test/Shell/SymbolFile/DWARF/debug-types-dwarf5.s
diff --git a/lit/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp b/test/Shell/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp
rename to test/Shell/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp
diff --git a/lit/SymbolFile/DWARF/debug-types-expressions.test b/test/Shell/SymbolFile/DWARF/debug-types-expressions.test
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-types-expressions.test
rename to test/Shell/SymbolFile/DWARF/debug-types-expressions.test
diff --git a/lit/SymbolFile/DWARF/debug-types-line-tables.s b/test/Shell/SymbolFile/DWARF/debug-types-line-tables.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-types-line-tables.s
rename to test/Shell/SymbolFile/DWARF/debug-types-line-tables.s
diff --git a/lit/SymbolFile/DWARF/debug-types-missing-signature.test b/test/Shell/SymbolFile/DWARF/debug-types-missing-signature.test
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-types-missing-signature.test
rename to test/Shell/SymbolFile/DWARF/debug-types-missing-signature.test
diff --git a/lit/SymbolFile/DWARF/debug-types-signature-loop.s b/test/Shell/SymbolFile/DWARF/debug-types-signature-loop.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug-types-signature-loop.s
rename to test/Shell/SymbolFile/DWARF/debug-types-signature-loop.s
diff --git a/lit/SymbolFile/DWARF/debug_aranges-empty-section.s b/test/Shell/SymbolFile/DWARF/debug_aranges-empty-section.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug_aranges-empty-section.s
rename to test/Shell/SymbolFile/DWARF/debug_aranges-empty-section.s
diff --git a/lit/SymbolFile/DWARF/debug_loc.s b/test/Shell/SymbolFile/DWARF/debug_loc.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug_loc.s
rename to test/Shell/SymbolFile/DWARF/debug_loc.s
diff --git a/lit/SymbolFile/DWARF/debug_ranges-missing-section.s b/test/Shell/SymbolFile/DWARF/debug_ranges-missing-section.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug_ranges-missing-section.s
rename to test/Shell/SymbolFile/DWARF/debug_ranges-missing-section.s
diff --git a/lit/SymbolFile/DWARF/debug_ranges.s b/test/Shell/SymbolFile/DWARF/debug_ranges.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug_ranges.s
rename to test/Shell/SymbolFile/DWARF/debug_ranges.s
diff --git a/lit/SymbolFile/DWARF/debug_ranges_and_rnglists.test b/test/Shell/SymbolFile/DWARF/debug_ranges_and_rnglists.test
similarity index 100%
rename from lit/SymbolFile/DWARF/debug_ranges_and_rnglists.test
rename to test/Shell/SymbolFile/DWARF/debug_ranges_and_rnglists.test
diff --git a/lit/SymbolFile/DWARF/debug_rnglists.s b/test/Shell/SymbolFile/DWARF/debug_rnglists.s
similarity index 100%
rename from lit/SymbolFile/DWARF/debug_rnglists.s
rename to test/Shell/SymbolFile/DWARF/debug_rnglists.s
diff --git a/lit/SymbolFile/DWARF/deterministic-build.cpp b/test/Shell/SymbolFile/DWARF/deterministic-build.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/deterministic-build.cpp
rename to test/Shell/SymbolFile/DWARF/deterministic-build.cpp
diff --git a/lit/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s b/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s
similarity index 100%
rename from lit/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s
rename to test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s
diff --git a/lit/SymbolFile/DWARF/dir-separator-no-comp-dir.s b/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir.s
similarity index 100%
rename from lit/SymbolFile/DWARF/dir-separator-no-comp-dir.s
rename to test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir.s
diff --git a/lit/SymbolFile/DWARF/dir-separator-posix.s b/test/Shell/SymbolFile/DWARF/dir-separator-posix.s
similarity index 100%
rename from lit/SymbolFile/DWARF/dir-separator-posix.s
rename to test/Shell/SymbolFile/DWARF/dir-separator-posix.s
diff --git a/lit/SymbolFile/DWARF/dir-separator-windows.s b/test/Shell/SymbolFile/DWARF/dir-separator-windows.s
similarity index 100%
rename from lit/SymbolFile/DWARF/dir-separator-windows.s
rename to test/Shell/SymbolFile/DWARF/dir-separator-windows.s
diff --git a/lit/SymbolFile/DWARF/dwarf5-index-is-used.cpp b/test/Shell/SymbolFile/DWARF/dwarf5-index-is-used.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/dwarf5-index-is-used.cpp
rename to test/Shell/SymbolFile/DWARF/dwarf5-index-is-used.cpp
diff --git a/lit/SymbolFile/DWARF/dwarf5-partial-index.cpp b/test/Shell/SymbolFile/DWARF/dwarf5-partial-index.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/dwarf5-partial-index.cpp
rename to test/Shell/SymbolFile/DWARF/dwarf5-partial-index.cpp
diff --git a/lit/SymbolFile/DWARF/dwarf5_locations.s b/test/Shell/SymbolFile/DWARF/dwarf5_locations.s
similarity index 100%
rename from lit/SymbolFile/DWARF/dwarf5_locations.s
rename to test/Shell/SymbolFile/DWARF/dwarf5_locations.s
diff --git a/lit/SymbolFile/DWARF/find-basic-function.cpp b/test/Shell/SymbolFile/DWARF/find-basic-function.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-basic-function.cpp
rename to test/Shell/SymbolFile/DWARF/find-basic-function.cpp
diff --git a/lit/SymbolFile/DWARF/find-basic-namespace.cpp b/test/Shell/SymbolFile/DWARF/find-basic-namespace.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-basic-namespace.cpp
rename to test/Shell/SymbolFile/DWARF/find-basic-namespace.cpp
diff --git a/lit/SymbolFile/DWARF/find-basic-type.cpp b/test/Shell/SymbolFile/DWARF/find-basic-type.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-basic-type.cpp
rename to test/Shell/SymbolFile/DWARF/find-basic-type.cpp
diff --git a/lit/SymbolFile/DWARF/find-basic-variable.cpp b/test/Shell/SymbolFile/DWARF/find-basic-variable.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-basic-variable.cpp
rename to test/Shell/SymbolFile/DWARF/find-basic-variable.cpp
diff --git a/lit/SymbolFile/DWARF/find-function-regex.cpp b/test/Shell/SymbolFile/DWARF/find-function-regex.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-function-regex.cpp
rename to test/Shell/SymbolFile/DWARF/find-function-regex.cpp
diff --git a/lit/SymbolFile/DWARF/find-inline-method.s b/test/Shell/SymbolFile/DWARF/find-inline-method.s
similarity index 100%
rename from lit/SymbolFile/DWARF/find-inline-method.s
rename to test/Shell/SymbolFile/DWARF/find-inline-method.s
diff --git a/lit/SymbolFile/DWARF/find-method-local-struct.cpp b/test/Shell/SymbolFile/DWARF/find-method-local-struct.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-method-local-struct.cpp
rename to test/Shell/SymbolFile/DWARF/find-method-local-struct.cpp
diff --git a/lit/SymbolFile/DWARF/find-method.cpp b/test/Shell/SymbolFile/DWARF/find-method.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-method.cpp
rename to test/Shell/SymbolFile/DWARF/find-method.cpp
diff --git a/lit/SymbolFile/DWARF/find-qualified-variable.cpp b/test/Shell/SymbolFile/DWARF/find-qualified-variable.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-qualified-variable.cpp
rename to test/Shell/SymbolFile/DWARF/find-qualified-variable.cpp
diff --git a/lit/SymbolFile/DWARF/find-type-in-function.cpp b/test/Shell/SymbolFile/DWARF/find-type-in-function.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-type-in-function.cpp
rename to test/Shell/SymbolFile/DWARF/find-type-in-function.cpp
diff --git a/lit/SymbolFile/DWARF/find-variable-dwo.cpp b/test/Shell/SymbolFile/DWARF/find-variable-dwo.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-variable-dwo.cpp
rename to test/Shell/SymbolFile/DWARF/find-variable-dwo.cpp
diff --git a/lit/SymbolFile/DWARF/find-variable-file.cpp b/test/Shell/SymbolFile/DWARF/find-variable-file.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/find-variable-file.cpp
rename to test/Shell/SymbolFile/DWARF/find-variable-file.cpp
diff --git a/lit/SymbolFile/DWARF/forward-declarations.s b/test/Shell/SymbolFile/DWARF/forward-declarations.s
similarity index 100%
rename from lit/SymbolFile/DWARF/forward-declarations.s
rename to test/Shell/SymbolFile/DWARF/forward-declarations.s
diff --git a/lit/SymbolFile/DWARF/gnu-style-compression.cpp b/test/Shell/SymbolFile/DWARF/gnu-style-compression.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/gnu-style-compression.cpp
rename to test/Shell/SymbolFile/DWARF/gnu-style-compression.cpp
diff --git a/lit/SymbolFile/DWARF/lit.local.cfg b/test/Shell/SymbolFile/DWARF/lit.local.cfg
similarity index 100%
rename from lit/SymbolFile/DWARF/lit.local.cfg
rename to test/Shell/SymbolFile/DWARF/lit.local.cfg
diff --git a/lit/SymbolFile/DWARF/parallel-indexing-stress.s b/test/Shell/SymbolFile/DWARF/parallel-indexing-stress.s
similarity index 100%
rename from lit/SymbolFile/DWARF/parallel-indexing-stress.s
rename to test/Shell/SymbolFile/DWARF/parallel-indexing-stress.s
diff --git a/lit/SymbolFile/DWARF/split-dwarf-inlining.cpp b/test/Shell/SymbolFile/DWARF/split-dwarf-inlining.cpp
similarity index 100%
rename from lit/SymbolFile/DWARF/split-dwarf-inlining.cpp
rename to test/Shell/SymbolFile/DWARF/split-dwarf-inlining.cpp
diff --git a/lit/SymbolFile/DWARF/split-dwarf-multiple-cu.ll b/test/Shell/SymbolFile/DWARF/split-dwarf-multiple-cu.ll
similarity index 100%
rename from lit/SymbolFile/DWARF/split-dwarf-multiple-cu.ll
rename to test/Shell/SymbolFile/DWARF/split-dwarf-multiple-cu.ll
diff --git a/lit/SymbolFile/Inputs/sizeless-symbol.s b/test/Shell/SymbolFile/Inputs/sizeless-symbol.s
similarity index 100%
rename from lit/SymbolFile/Inputs/sizeless-symbol.s
rename to test/Shell/SymbolFile/Inputs/sizeless-symbol.s
diff --git a/lit/SymbolFile/Inputs/target-symbols-add-unwind.c b/test/Shell/SymbolFile/Inputs/target-symbols-add-unwind.c
similarity index 100%
rename from lit/SymbolFile/Inputs/target-symbols-add-unwind.c
rename to test/Shell/SymbolFile/Inputs/target-symbols-add-unwind.c
diff --git a/lit/SymbolFile/NativePDB/Inputs/ast-functions.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/ast-functions.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/ast-functions.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/ast-functions.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/ast-methods.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/ast-methods.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/ast-methods.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/ast-methods.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/ast-types.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/ast-types.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/ast-types.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/ast-types.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/bitfields.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/bitfields.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/bitfields.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/bitfields.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/break-by-function.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/break-by-function.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/break-by-function.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/break-by-function.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/break-by-line.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/break-by-line.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/break-by-line.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/break-by-line.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/disassembly.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/disassembly.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/disassembly.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/disassembly.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/function-types-builtins.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/function-types-builtins.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/function-types-builtins.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/function-types-builtins.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/function-types-calling-conv.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/function-types-calling-conv.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/function-types-calling-conv.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/function-types-calling-conv.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/function-types-classes.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/function-types-classes.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/function-types-classes.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/function-types-classes.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/globals-classes.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/globals-classes.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/globals-classes.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/globals-classes.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/globals-fundamental.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/globals-fundamental.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/globals-fundamental.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/globals-fundamental.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/local-variables.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/nested-types.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/nested-types.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/nested-types.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/nested-types.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/s_constant.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/s_constant.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/s_constant.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/s_constant.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/s_constant.s b/test/Shell/SymbolFile/NativePDB/Inputs/s_constant.s
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/s_constant.s
rename to test/Shell/SymbolFile/NativePDB/Inputs/s_constant.s
diff --git a/lit/SymbolFile/NativePDB/Inputs/source-list.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/source-list.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/source-list.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/source-list.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/stack_unwinding01.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/stack_unwinding01.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/stack_unwinding01.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/stack_unwinding01.lldbinit
diff --git a/lit/SymbolFile/NativePDB/Inputs/tag-types.lldbinit b/test/Shell/SymbolFile/NativePDB/Inputs/tag-types.lldbinit
similarity index 100%
rename from lit/SymbolFile/NativePDB/Inputs/tag-types.lldbinit
rename to test/Shell/SymbolFile/NativePDB/Inputs/tag-types.lldbinit
diff --git a/lit/SymbolFile/NativePDB/ast-functions-msvc.cpp b/test/Shell/SymbolFile/NativePDB/ast-functions-msvc.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/ast-functions-msvc.cpp
rename to test/Shell/SymbolFile/NativePDB/ast-functions-msvc.cpp
diff --git a/lit/SymbolFile/NativePDB/ast-functions.cpp b/test/Shell/SymbolFile/NativePDB/ast-functions.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/ast-functions.cpp
rename to test/Shell/SymbolFile/NativePDB/ast-functions.cpp
diff --git a/lit/SymbolFile/NativePDB/ast-methods.cpp b/test/Shell/SymbolFile/NativePDB/ast-methods.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/ast-methods.cpp
rename to test/Shell/SymbolFile/NativePDB/ast-methods.cpp
diff --git a/lit/SymbolFile/NativePDB/ast-types.cpp b/test/Shell/SymbolFile/NativePDB/ast-types.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/ast-types.cpp
rename to test/Shell/SymbolFile/NativePDB/ast-types.cpp
diff --git a/lit/SymbolFile/NativePDB/bitfields.cpp b/test/Shell/SymbolFile/NativePDB/bitfields.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/bitfields.cpp
rename to test/Shell/SymbolFile/NativePDB/bitfields.cpp
diff --git a/lit/SymbolFile/NativePDB/break-by-function.cpp b/test/Shell/SymbolFile/NativePDB/break-by-function.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/break-by-function.cpp
rename to test/Shell/SymbolFile/NativePDB/break-by-function.cpp
diff --git a/lit/SymbolFile/NativePDB/break-by-line.cpp b/test/Shell/SymbolFile/NativePDB/break-by-line.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/break-by-line.cpp
rename to test/Shell/SymbolFile/NativePDB/break-by-line.cpp
diff --git a/lit/SymbolFile/NativePDB/disassembly.cpp b/test/Shell/SymbolFile/NativePDB/disassembly.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/disassembly.cpp
rename to test/Shell/SymbolFile/NativePDB/disassembly.cpp
diff --git a/lit/SymbolFile/NativePDB/function-types-builtins.cpp b/test/Shell/SymbolFile/NativePDB/function-types-builtins.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/function-types-builtins.cpp
rename to test/Shell/SymbolFile/NativePDB/function-types-builtins.cpp
diff --git a/lit/SymbolFile/NativePDB/function-types-calling-conv.cpp b/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/function-types-calling-conv.cpp
rename to test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp
diff --git a/lit/SymbolFile/NativePDB/function-types-classes.cpp b/test/Shell/SymbolFile/NativePDB/function-types-classes.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/function-types-classes.cpp
rename to test/Shell/SymbolFile/NativePDB/function-types-classes.cpp
diff --git a/lit/SymbolFile/NativePDB/global-classes.cpp b/test/Shell/SymbolFile/NativePDB/global-classes.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/global-classes.cpp
rename to test/Shell/SymbolFile/NativePDB/global-classes.cpp
diff --git a/lit/SymbolFile/NativePDB/globals-bss.cpp b/test/Shell/SymbolFile/NativePDB/globals-bss.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/globals-bss.cpp
rename to test/Shell/SymbolFile/NativePDB/globals-bss.cpp
diff --git a/lit/SymbolFile/NativePDB/globals-fundamental.cpp b/test/Shell/SymbolFile/NativePDB/globals-fundamental.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/globals-fundamental.cpp
rename to test/Shell/SymbolFile/NativePDB/globals-fundamental.cpp
diff --git a/lit/SymbolFile/NativePDB/local-variables.cpp b/test/Shell/SymbolFile/NativePDB/local-variables.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/local-variables.cpp
rename to test/Shell/SymbolFile/NativePDB/local-variables.cpp
diff --git a/lit/SymbolFile/NativePDB/nested-types.cpp b/test/Shell/SymbolFile/NativePDB/nested-types.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/nested-types.cpp
rename to test/Shell/SymbolFile/NativePDB/nested-types.cpp
diff --git a/lit/SymbolFile/NativePDB/s_constant.cpp b/test/Shell/SymbolFile/NativePDB/s_constant.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/s_constant.cpp
rename to test/Shell/SymbolFile/NativePDB/s_constant.cpp
diff --git a/lit/SymbolFile/NativePDB/source-list.cpp b/test/Shell/SymbolFile/NativePDB/source-list.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/source-list.cpp
rename to test/Shell/SymbolFile/NativePDB/source-list.cpp
diff --git a/lit/SymbolFile/NativePDB/stack_unwinding01.cpp b/test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/stack_unwinding01.cpp
rename to test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp
diff --git a/lit/SymbolFile/NativePDB/tag-types.cpp b/test/Shell/SymbolFile/NativePDB/tag-types.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/tag-types.cpp
rename to test/Shell/SymbolFile/NativePDB/tag-types.cpp
diff --git a/lit/SymbolFile/NativePDB/typedefs.cpp b/test/Shell/SymbolFile/NativePDB/typedefs.cpp
similarity index 100%
rename from lit/SymbolFile/NativePDB/typedefs.cpp
rename to test/Shell/SymbolFile/NativePDB/typedefs.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/AstRestoreTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/AstRestoreTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/AstRestoreTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/AstRestoreTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/CompilandsTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/CompilandsTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/CompilandsTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/CompilandsTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/ExpressionsTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/ExpressionsTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/ExpressionsTest0.script b/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest0.script
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/ExpressionsTest0.script
rename to test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest0.script
diff --git a/lit/SymbolFile/PDB/Inputs/ExpressionsTest1.script b/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest1.script
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/ExpressionsTest1.script
rename to test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest1.script
diff --git a/lit/SymbolFile/PDB/Inputs/ExpressionsTest2.script b/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest2.script
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/ExpressionsTest2.script
rename to test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest2.script
diff --git a/lit/SymbolFile/PDB/Inputs/FuncSymbols.cpp b/test/Shell/SymbolFile/PDB/Inputs/FuncSymbols.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/FuncSymbols.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/FuncSymbols.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp b/test/Shell/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/FuncSymbolsTestMain.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h b/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h
rename to test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h
diff --git a/lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord b/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord
rename to test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord
diff --git a/lit/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/PointerTypeTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/PointerTypeTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/PointerTypeTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/PointerTypeTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/TypeQualsTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/TypeQualsTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/TypeQualsTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/TypeQualsTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/UdtLayoutTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/UdtLayoutTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/UdtLayoutTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/UdtLayoutTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/UdtLayoutTest.script b/test/Shell/SymbolFile/PDB/Inputs/UdtLayoutTest.script
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/UdtLayoutTest.script
rename to test/Shell/SymbolFile/PDB/Inputs/UdtLayoutTest.script
diff --git a/lit/SymbolFile/PDB/Inputs/VBases.cpp b/test/Shell/SymbolFile/PDB/Inputs/VBases.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/VBases.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/VBases.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/VBases.script b/test/Shell/SymbolFile/PDB/Inputs/VBases.script
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/VBases.script
rename to test/Shell/SymbolFile/PDB/Inputs/VBases.script
diff --git a/lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp
diff --git a/lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.script b/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.script
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/VariablesLocationsTest.script
rename to test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.script
diff --git a/lit/SymbolFile/PDB/Inputs/VariablesTest.cpp b/test/Shell/SymbolFile/PDB/Inputs/VariablesTest.cpp
similarity index 100%
rename from lit/SymbolFile/PDB/Inputs/VariablesTest.cpp
rename to test/Shell/SymbolFile/PDB/Inputs/VariablesTest.cpp
diff --git a/lit/SymbolFile/PDB/ast-restore.test b/test/Shell/SymbolFile/PDB/ast-restore.test
similarity index 100%
rename from lit/SymbolFile/PDB/ast-restore.test
rename to test/Shell/SymbolFile/PDB/ast-restore.test
diff --git a/lit/SymbolFile/PDB/calling-conventions.test b/test/Shell/SymbolFile/PDB/calling-conventions.test
similarity index 100%
rename from lit/SymbolFile/PDB/calling-conventions.test
rename to test/Shell/SymbolFile/PDB/calling-conventions.test
diff --git a/lit/SymbolFile/PDB/class-layout.test b/test/Shell/SymbolFile/PDB/class-layout.test
similarity index 100%
rename from lit/SymbolFile/PDB/class-layout.test
rename to test/Shell/SymbolFile/PDB/class-layout.test
diff --git a/lit/SymbolFile/PDB/compilands.test b/test/Shell/SymbolFile/PDB/compilands.test
similarity index 100%
rename from lit/SymbolFile/PDB/compilands.test
rename to test/Shell/SymbolFile/PDB/compilands.test
diff --git a/lit/SymbolFile/PDB/enums-layout.test b/test/Shell/SymbolFile/PDB/enums-layout.test
similarity index 100%
rename from lit/SymbolFile/PDB/enums-layout.test
rename to test/Shell/SymbolFile/PDB/enums-layout.test
diff --git a/lit/SymbolFile/PDB/expressions.test b/test/Shell/SymbolFile/PDB/expressions.test
similarity index 100%
rename from lit/SymbolFile/PDB/expressions.test
rename to test/Shell/SymbolFile/PDB/expressions.test
diff --git a/lit/SymbolFile/PDB/func-symbols.test b/test/Shell/SymbolFile/PDB/func-symbols.test
similarity index 100%
rename from lit/SymbolFile/PDB/func-symbols.test
rename to test/Shell/SymbolFile/PDB/func-symbols.test
diff --git a/lit/SymbolFile/PDB/function-level-linking.test b/test/Shell/SymbolFile/PDB/function-level-linking.test
similarity index 100%
rename from lit/SymbolFile/PDB/function-level-linking.test
rename to test/Shell/SymbolFile/PDB/function-level-linking.test
diff --git a/lit/SymbolFile/PDB/function-nested-block.test b/test/Shell/SymbolFile/PDB/function-nested-block.test
similarity index 100%
rename from lit/SymbolFile/PDB/function-nested-block.test
rename to test/Shell/SymbolFile/PDB/function-nested-block.test
diff --git a/lit/SymbolFile/PDB/pointers.test b/test/Shell/SymbolFile/PDB/pointers.test
similarity index 100%
rename from lit/SymbolFile/PDB/pointers.test
rename to test/Shell/SymbolFile/PDB/pointers.test
diff --git a/lit/SymbolFile/PDB/type-quals.test b/test/Shell/SymbolFile/PDB/type-quals.test
similarity index 100%
rename from lit/SymbolFile/PDB/type-quals.test
rename to test/Shell/SymbolFile/PDB/type-quals.test
diff --git a/lit/SymbolFile/PDB/typedefs.test b/test/Shell/SymbolFile/PDB/typedefs.test
similarity index 100%
rename from lit/SymbolFile/PDB/typedefs.test
rename to test/Shell/SymbolFile/PDB/typedefs.test
diff --git a/lit/SymbolFile/PDB/udt-layout.test b/test/Shell/SymbolFile/PDB/udt-layout.test
similarity index 100%
rename from lit/SymbolFile/PDB/udt-layout.test
rename to test/Shell/SymbolFile/PDB/udt-layout.test
diff --git a/lit/SymbolFile/PDB/variables-locations.test b/test/Shell/SymbolFile/PDB/variables-locations.test
similarity index 100%
rename from lit/SymbolFile/PDB/variables-locations.test
rename to test/Shell/SymbolFile/PDB/variables-locations.test
diff --git a/lit/SymbolFile/PDB/variables.test b/test/Shell/SymbolFile/PDB/variables.test
similarity index 100%
rename from lit/SymbolFile/PDB/variables.test
rename to test/Shell/SymbolFile/PDB/variables.test
diff --git a/lit/SymbolFile/PDB/vbases.test b/test/Shell/SymbolFile/PDB/vbases.test
similarity index 100%
rename from lit/SymbolFile/PDB/vbases.test
rename to test/Shell/SymbolFile/PDB/vbases.test
diff --git a/lit/SymbolFile/dissassemble-entry-point.s b/test/Shell/SymbolFile/dissassemble-entry-point.s
similarity index 100%
rename from lit/SymbolFile/dissassemble-entry-point.s
rename to test/Shell/SymbolFile/dissassemble-entry-point.s
diff --git a/lit/SymbolFile/sizeless-symbol.test b/test/Shell/SymbolFile/sizeless-symbol.test
similarity index 100%
rename from lit/SymbolFile/sizeless-symbol.test
rename to test/Shell/SymbolFile/sizeless-symbol.test
diff --git a/lit/SymbolFile/target-symbols-add-unwind.test b/test/Shell/SymbolFile/target-symbols-add-unwind.test
similarity index 100%
rename from lit/SymbolFile/target-symbols-add-unwind.test
rename to test/Shell/SymbolFile/target-symbols-add-unwind.test
diff --git a/lit/Unwind/Inputs/call-asm.c b/test/Shell/Unwind/Inputs/call-asm.c
similarity index 100%
rename from lit/Unwind/Inputs/call-asm.c
rename to test/Shell/Unwind/Inputs/call-asm.c
diff --git a/lit/Unwind/Inputs/eh-frame-dwarf-unwind.s b/test/Shell/Unwind/Inputs/eh-frame-dwarf-unwind.s
similarity index 100%
rename from lit/Unwind/Inputs/eh-frame-dwarf-unwind.s
rename to test/Shell/Unwind/Inputs/eh-frame-dwarf-unwind.s
diff --git a/lit/Unwind/Inputs/eh-frame-small-fde.s b/test/Shell/Unwind/Inputs/eh-frame-small-fde.s
similarity index 100%
rename from lit/Unwind/Inputs/eh-frame-small-fde.s
rename to test/Shell/Unwind/Inputs/eh-frame-small-fde.s
diff --git a/lit/Unwind/Inputs/prefer-debug-over-eh-frame.s b/test/Shell/Unwind/Inputs/prefer-debug-over-eh-frame.s
similarity index 100%
rename from lit/Unwind/Inputs/prefer-debug-over-eh-frame.s
rename to test/Shell/Unwind/Inputs/prefer-debug-over-eh-frame.s
diff --git a/lit/Unwind/Inputs/trap_frame_sym_ctx.s b/test/Shell/Unwind/Inputs/trap_frame_sym_ctx.s
similarity index 100%
rename from lit/Unwind/Inputs/trap_frame_sym_ctx.s
rename to test/Shell/Unwind/Inputs/trap_frame_sym_ctx.s
diff --git a/lit/Unwind/Inputs/unwind-plan-dwarf-dump.s b/test/Shell/Unwind/Inputs/unwind-plan-dwarf-dump.s
similarity index 100%
rename from lit/Unwind/Inputs/unwind-plan-dwarf-dump.s
rename to test/Shell/Unwind/Inputs/unwind-plan-dwarf-dump.s
diff --git a/lit/Unwind/eh-frame-dwarf-unwind.test b/test/Shell/Unwind/eh-frame-dwarf-unwind.test
similarity index 100%
rename from lit/Unwind/eh-frame-dwarf-unwind.test
rename to test/Shell/Unwind/eh-frame-dwarf-unwind.test
diff --git a/lit/Unwind/eh-frame-small-fde.test b/test/Shell/Unwind/eh-frame-small-fde.test
similarity index 100%
rename from lit/Unwind/eh-frame-small-fde.test
rename to test/Shell/Unwind/eh-frame-small-fde.test
diff --git a/lit/Unwind/prefer-debug-over-eh-frame.test b/test/Shell/Unwind/prefer-debug-over-eh-frame.test
similarity index 100%
rename from lit/Unwind/prefer-debug-over-eh-frame.test
rename to test/Shell/Unwind/prefer-debug-over-eh-frame.test
diff --git a/lit/Unwind/trap_frame_sym_ctx.test b/test/Shell/Unwind/trap_frame_sym_ctx.test
similarity index 100%
rename from lit/Unwind/trap_frame_sym_ctx.test
rename to test/Shell/Unwind/trap_frame_sym_ctx.test
diff --git a/lit/Unwind/unwind-plan-dwarf-dump.test b/test/Shell/Unwind/unwind-plan-dwarf-dump.test
similarity index 100%
rename from lit/Unwind/unwind-plan-dwarf-dump.test
rename to test/Shell/Unwind/unwind-plan-dwarf-dump.test
diff --git a/lit/Watchpoint/Inputs/main.cpp b/test/Shell/Watchpoint/Inputs/main.cpp
similarity index 100%
rename from lit/Watchpoint/Inputs/main.cpp
rename to test/Shell/Watchpoint/Inputs/main.cpp
diff --git a/lit/Watchpoint/SetErrorCases.test b/test/Shell/Watchpoint/SetErrorCases.test
similarity index 100%
rename from lit/Watchpoint/SetErrorCases.test
rename to test/Shell/Watchpoint/SetErrorCases.test
diff --git a/lit/helper/__init__.py b/test/Shell/helper/__init__.py
similarity index 100%
rename from lit/helper/__init__.py
rename to test/Shell/helper/__init__.py
diff --git a/lit/helper/build.py b/test/Shell/helper/build.py
similarity index 100%
rename from lit/helper/build.py
rename to test/Shell/helper/build.py
diff --git a/lit/helper/toolchain.py b/test/Shell/helper/toolchain.py
similarity index 98%
rename from lit/helper/toolchain.py
rename to test/Shell/helper/toolchain.py
index 0290e12..d9e5c05 100644
--- a/lit/helper/toolchain.py
+++ b/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/lit/lit-lldb-init.in b/test/Shell/lit-lldb-init.in
similarity index 100%
rename from lit/lit-lldb-init.in
rename to test/Shell/lit-lldb-init.in
diff --git a/lit/lit.cfg.py b/test/Shell/lit.cfg.py
similarity index 96%
rename from lit/lit.cfg.py
rename to test/Shell/lit.cfg.py
index 208338c..3503e95 100644
--- a/lit/lit.cfg.py
+++ b/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/lit/lit.site.cfg.py.in b/test/Shell/lit.site.cfg.py.in
similarity index 95%
rename from lit/lit.site.cfg.py.in
rename to test/Shell/lit.site.cfg.py.in
index c9b6e09..459d560 100644
--- a/lit/lit.site.cfg.py.in
+++ b/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/test/Unit/README.md b/test/Unit/README.md
new file mode 100644
index 0000000..0302747
--- /dev/null
+++ b/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/lit/Unit/lit.cfg.py b/test/Unit/lit.cfg.py
similarity index 97%
rename from lit/Unit/lit.cfg.py
rename to test/Unit/lit.cfg.py
index 3633c73..e53bcd3 100644
--- a/lit/Unit/lit.cfg.py
+++ b/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/lit/Unit/lit.site.cfg.py.in b/test/Unit/lit.site.cfg.py.in
similarity index 93%
copy from lit/Unit/lit.site.cfg.py.in
copy to test/Unit/lit.site.cfg.py.in
index 0c629fd..9d9bcd4 100644
--- a/lit/Unit/lit.site.cfg.py.in
+++ b/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/test/lit.cfg.py b/test/lit.cfg.py
new file mode 100644
index 0000000..797750b
--- /dev/null
+++ b/test/lit.cfg.py
@@ -0,0 +1,41 @@
+# -*- Python -*-
+
+import os
+import platform
+import re
+import shutil
+import site
+import sys
+
+import lit.formats
+from lit.llvm import llvm_config
+from lit.llvm.subst import FindTool
+from lit.llvm.subst import ToolSubst
+from distutils.spawn import find_executable
+
+# This is the top level configuration. Most of these configuration options will
+# be overriden by individual lit configuration files in the test
+# subdirectories.
+
+# name: The name of this test suite.
+config.name = 'lldb'
+
+# testFormat: The test format to use to interpret tests.
+config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
+
+# suffixes: A list of file extensions to treat as test files. This is overriden
+# by individual lit.local.cfg files in the test subdirectories.
+config.suffixes = ['.test', '.cpp', '.s']
+
+# excludes: A list of directories to exclude from the testsuite. The 'Inputs'
+# subdirectories contain auxiliary inputs for various tests in their parent
+# directories.
+config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt']
+
+# test_source_root: The root path where tests are located.
+config.test_source_root = os.path.dirname(__file__)
+
+# test_exec_root: The root path where tests should be run.
+config.test_exec_root = os.path.join(config.lldb_obj_root, 'test')
+
+llvm_config.use_default_substitutions()
diff --git a/lit/Unit/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
similarity index 93%
rename from lit/Unit/lit.site.cfg.py.in
rename to test/lit.site.cfg.py.in
index 0c629fd..49d789d 100644
--- a/lit/Unit/lit.site.cfg.py.in
+++ b/test/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/lit.cfg.py")
