diff --git a/lldb/packages/Python/lldbsuite/__init__.py b/lldb/packages/Python/lldbsuite/__init__.py --- a/lldb/packages/Python/lldbsuite/__init__.py +++ b/lldb/packages/Python/lldbsuite/__init__.py @@ -22,11 +22,4 @@ # lldbsuite.lldb_test_src_root refers to the root of the python test case tree # (i.e. the actual unit tests). -lldb_test_root = os.path.join( - lldb_root, - "packages", - "Python", - "lldbsuite", - "test") -# TODO(rupprecht): update the above definition after moving test cases: -# lldb_test_root = os.path.join(lldb_root, "test", "API") +lldb_test_root = os.path.join(lldb_root, "test", "API") diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-qualifiers/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/function-qualifiers/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-qualifiers/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/multiple-inheritance/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/multiple-inheritance/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/multiple-inheritance/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-functions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-functions/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-functions/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/get-value-32bit-int/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/get-value-32bit-int/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/get-value-32bit-int/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/process/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/process/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbdata/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/sbdata/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/signals/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/signals/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/signals/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/type/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/type/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/type/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/completions/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/completions/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/completions/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile deleted file mode 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/android/platform/Makefile b/lldb/test/API/android/platform/Makefile rename from lldb/packages/Python/lldbsuite/test/android/platform/Makefile rename to lldb/test/API/android/platform/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py b/lldb/test/API/android/platform/TestDefaultCacheLineSize.py rename from lldb/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py rename to lldb/test/API/android/platform/TestDefaultCacheLineSize.py diff --git a/lldb/packages/Python/lldbsuite/test/android/platform/main.cpp b/lldb/test/API/android/platform/main.cpp rename from lldb/packages/Python/lldbsuite/test/android/platform/main.cpp rename to lldb/test/API/android/platform/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/api/check_public_api_headers/Makefile rename from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile rename to lldb/test/API/api/check_public_api_headers/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py rename from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py rename to lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/main.cpp.template b/lldb/test/API/api/check_public_api_headers/main.cpp.template rename from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/main.cpp.template rename to lldb/test/API/api/check_public_api_headers/main.cpp.template diff --git a/lldb/packages/Python/lldbsuite/test/api/command-return-object/Makefile b/lldb/test/API/api/command-return-object/Makefile rename from lldb/packages/Python/lldbsuite/test/api/command-return-object/Makefile rename to lldb/test/API/api/command-return-object/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/api/command-return-object/TestSBCommandReturnObject.py b/lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py rename from lldb/packages/Python/lldbsuite/test/api/command-return-object/TestSBCommandReturnObject.py rename to lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py diff --git a/lldb/packages/Python/lldbsuite/test/api/command-return-object/main.cpp b/lldb/test/API/api/command-return-object/main.cpp rename from lldb/packages/Python/lldbsuite/test/api/command-return-object/main.cpp rename to lldb/test/API/api/command-return-object/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/listeners/Makefile b/lldb/test/API/api/listeners/Makefile rename from lldb/packages/Python/lldbsuite/test/api/listeners/Makefile rename to lldb/test/API/api/listeners/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/api/listeners/TestListener.py b/lldb/test/API/api/listeners/TestListener.py rename from lldb/packages/Python/lldbsuite/test/api/listeners/TestListener.py rename to lldb/test/API/api/listeners/TestListener.py diff --git a/lldb/packages/Python/lldbsuite/test/api/listeners/main.c b/lldb/test/API/api/listeners/main.c rename from lldb/packages/Python/lldbsuite/test/api/listeners/main.c rename to lldb/test/API/api/listeners/main.c diff --git a/lldb/packages/Python/lldbsuite/test/api/log/TestAPILog.py b/lldb/test/API/api/log/TestAPILog.py rename from lldb/packages/Python/lldbsuite/test/api/log/TestAPILog.py rename to lldb/test/API/api/log/TestAPILog.py diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/.categories b/lldb/test/API/api/multiple-debuggers/.categories rename from lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/.categories rename to lldb/test/API/api/multiple-debuggers/.categories diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile b/lldb/test/API/api/multiple-debuggers/Makefile rename from lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile rename to lldb/test/API/api/multiple-debuggers/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py rename from lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py rename to lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/multi-process-driver.cpp b/lldb/test/API/api/multiple-debuggers/multi-process-driver.cpp rename from lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/multi-process-driver.cpp rename to lldb/test/API/api/multiple-debuggers/multi-process-driver.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/testprog.cpp b/lldb/test/API/api/multiple-debuggers/testprog.cpp rename from lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/testprog.cpp rename to lldb/test/API/api/multiple-debuggers/testprog.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile b/lldb/test/API/api/multiple-targets/Makefile rename from lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile rename to lldb/test/API/api/multiple-targets/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-targets/TestMultipleTargets.py b/lldb/test/API/api/multiple-targets/TestMultipleTargets.py rename from lldb/packages/Python/lldbsuite/test/api/multiple-targets/TestMultipleTargets.py rename to lldb/test/API/api/multiple-targets/TestMultipleTargets.py diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-targets/main.cpp b/lldb/test/API/api/multiple-targets/main.cpp rename from lldb/packages/Python/lldbsuite/test/api/multiple-targets/main.cpp rename to lldb/test/API/api/multiple-targets/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile b/lldb/test/API/api/multithreaded/Makefile rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile rename to lldb/test/API/api/multithreaded/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py b/lldb/test/API/api/multithreaded/TestMultithreaded.py rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py rename to lldb/test/API/api/multithreaded/TestMultithreaded.py diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/common.h b/lldb/test/API/api/multithreaded/common.h rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/common.h rename to lldb/test/API/api/multithreaded/common.h diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp.template b/lldb/test/API/api/multithreaded/driver.cpp.template rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp.template rename to lldb/test/API/api/multithreaded/driver.cpp.template diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/inferior.cpp b/lldb/test/API/api/multithreaded/inferior.cpp rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/inferior.cpp rename to lldb/test/API/api/multithreaded/inferior.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/listener_test.cpp.template b/lldb/test/API/api/multithreaded/listener_test.cpp.template rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/listener_test.cpp.template rename to lldb/test/API/api/multithreaded/listener_test.cpp.template diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_breakpoint_callback.cpp.template b/lldb/test/API/api/multithreaded/test_breakpoint_callback.cpp.template rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/test_breakpoint_callback.cpp.template rename to lldb/test/API/api/multithreaded/test_breakpoint_callback.cpp.template diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_description.cpp.template b/lldb/test/API/api/multithreaded/test_listener_event_description.cpp.template rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_description.cpp.template rename to lldb/test/API/api/multithreaded/test_listener_event_description.cpp.template diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_process_state.cpp.template b/lldb/test/API/api/multithreaded/test_listener_event_process_state.cpp.template rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_process_state.cpp.template rename to lldb/test/API/api/multithreaded/test_listener_event_process_state.cpp.template diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_resume.cpp.template b/lldb/test/API/api/multithreaded/test_listener_resume.cpp.template rename from lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_resume.cpp.template rename to lldb/test/API/api/multithreaded/test_listener_resume.cpp.template diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile b/lldb/test/API/arm/breakpoint-it/Makefile rename from lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile rename to lldb/test/API/arm/breakpoint-it/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/TestBreakpointIt.py b/lldb/test/API/arm/breakpoint-it/TestBreakpointIt.py rename from lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/TestBreakpointIt.py rename to lldb/test/API/arm/breakpoint-it/TestBreakpointIt.py diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/main.c b/lldb/test/API/arm/breakpoint-it/main.c rename from lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/main.c rename to lldb/test/API/arm/breakpoint-it/main.c diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile b/lldb/test/API/arm/breakpoint-thumb-codesection/Makefile rename from lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile rename to lldb/test/API/arm/breakpoint-thumb-codesection/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py b/lldb/test/API/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py rename from lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py rename to lldb/test/API/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/main.c b/lldb/test/API/arm/breakpoint-thumb-codesection/main.c rename from lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/main.c rename to lldb/test/API/arm/breakpoint-thumb-codesection/main.c diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/TestEmulations.py b/lldb/test/API/arm/emulation/TestEmulations.py rename from lldb/packages/Python/lldbsuite/test/arm/emulation/TestEmulations.py rename to lldb/test/API/arm/emulation/TestEmulations.py diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-10-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-10-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-10-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-10-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-11-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-11-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-11-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-11-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-12-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-12-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-12-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-12-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-3-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-3-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-3-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-3-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-4-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-4-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-4-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-4-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-4-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-4-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-4-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-4-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-5-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-5-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-5-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-5-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-5-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-5-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-5-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-5-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-6-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-6-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-6-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-6-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-6-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-6-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-6-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-6-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-7-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-7-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-7-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-7-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-7-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-7-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-7-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-7-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-8-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-8-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-8-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-8-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-8-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-8-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-8-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-8-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-9-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-add-9-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-add-9-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-add-9-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-bic-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-bic-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-bic-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-bic-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-bic-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-bic-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-bic-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-bic-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldmia-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldmia-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldmia-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldmia-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldmia-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldmia-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldmia-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldmia-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-3-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldmia-3-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-3-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldmia-3-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldmia-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldmia-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldmia-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-10-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-10-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-10-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-10-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-11-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-11-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-11-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-11-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-12-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-12-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-12-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-12-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-3-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-3-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-3-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-3-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-4-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-4-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-4-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-4-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-4-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-4-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-4-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-4-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-5-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-5-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-5-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-5-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-5-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-5-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-5-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-5-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-6-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-6-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-6-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-6-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-6-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-6-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-6-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-6-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-7-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-7-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-7-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-7-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-7-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-7-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-7-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-7-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-8-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-8-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-8-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-8-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-8-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-8-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-8-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-8-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-9-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldr-9-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldr-9-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldr-9-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrd-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldrd-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrd-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldrd-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrd-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldrd-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrd-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldrd-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrd-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldrd-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrd-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldrd-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrh-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldrh-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrh-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldrh-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrsh-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldrsh-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrsh-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldrsh-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrsh-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-ldrsh-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-ldrsh-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-ldrsh-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-10-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-10-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-10-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-10-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-11-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-11-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-11-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-11-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-12-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-12-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-12-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-12-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-13-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-13-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-13-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-13-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-14-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-14-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-14-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-14-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-15-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-15-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-15-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-15-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-16-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-16-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-16-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-16-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-17-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-17-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-17-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-17-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-18-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-18-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-18-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-18-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-19-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-19-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-19-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-19-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-20-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-20-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-20-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-20-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-21-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-21-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-21-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-21-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-22-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-22-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-22-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-22-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-23-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-23-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-23-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-23-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-24-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-24-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-24-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-24-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-25-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-25-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-25-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-25-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-26-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-26-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-26-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-26-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-27-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-27-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-27-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-27-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-28-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-28-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-28-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-28-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-29-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-29-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-29-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-29-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-3-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-3-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-3-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-3-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-30-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-30-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-30-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-30-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-31-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-31-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-31-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-31-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-4-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-4-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-4-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-4-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-4-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-4-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-4-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-4-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-5-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-5-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-5-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-5-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-5-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-5-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-5-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-5-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-6-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-6-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-6-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-6-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-6-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-6-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-6-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-6-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-7-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-7-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-7-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-7-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-8-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-8-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-8-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-8-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-9-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mov-9-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mov-9-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mov-9-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-moveq-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-moveq-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-moveq-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-moveq-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-movs-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-movs-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-movs-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-movs-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mvn-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mvn-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mvn-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mvn-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mvn-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mvn-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mvn-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mvn-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-3-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mvn-3-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-3-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mvn-3-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mvn-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mvn-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-4-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-mvn-4-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-4-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mvn-4-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-4-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-mvn-4-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-mvn-4-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-mvn-4-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-pop-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-pop-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-pop-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-pop-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-pop-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-pop-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-pop-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-pop-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-pop-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-pop-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-pop-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-push-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-push-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-push-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-push-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-push-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-push-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-push-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-push-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-3-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-push-3-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-3-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-push-3-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-push-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-push-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-push-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-str-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-str-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-str-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-str-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-str-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-str-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-str-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-str-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-3-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-str-3-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-3-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-str-3-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-str-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-str-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-4-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-str-4-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-4-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-str-4-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-4-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-str-4-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-4-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-str-4-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-5-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-str-5-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-str-5-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-str-5-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strb-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-strb-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strb-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-strb-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strb-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-strb-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strb-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-strb-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strbt-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-strbt-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strbt-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-strbt-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strd-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-strd-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strd-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-strd-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strt-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-strt-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-strt-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-strt-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-10-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-10-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-10-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-10-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-2-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-2-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-2-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-2-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-3-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-3-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-3-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-3-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-4-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-4-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-4-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-4-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-4-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-4-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-4-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-4-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-5-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-5-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-5-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-5-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-5-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-5-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-5-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-5-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-6-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-6-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-6-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-6-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-6-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-6-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-6-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-6-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-8-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-8-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-8-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-8-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-9-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-sub-9-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-sub-9-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-sub-9-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-1-arm.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-1-arm.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-1-arm.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-1-arm.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-10-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-10-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-10-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-10-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-4-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-4-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-4-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-4-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-5-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-5-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-5-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-5-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-6-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-6-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-6-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-6-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-8-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-8-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-8-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-8-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-9-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-subs-9-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-subs-9-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-subs-9-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpop-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-vpop-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpop-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-vpop-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpop-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-vpop-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpop-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-vpop-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpop-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-vpop-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpop-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-vpop-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpush-1-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-vpush-1-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpush-1-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-vpush-1-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpush-2-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-vpush-2-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpush-2-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-vpush-2-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpush-3-thumb.dat b/lldb/test/API/arm/emulation/new-test-files/test-vpush-3-thumb.dat rename from lldb/packages/Python/lldbsuite/test/arm/emulation/new-test-files/test-vpush-3-thumb.dat rename to lldb/test/API/arm/emulation/new-test-files/test-vpush-3-thumb.dat diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/Makefile b/lldb/test/API/benchmarks/continue/Makefile rename from lldb/packages/Python/lldbsuite/test/benchmarks/continue/Makefile rename to lldb/test/API/benchmarks/continue/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py b/lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py rename from lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py rename to lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/main.cpp b/lldb/test/API/benchmarks/continue/main.cpp rename from lldb/packages/Python/lldbsuite/test/benchmarks/continue/main.cpp rename to lldb/test/API/benchmarks/continue/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/Makefile b/lldb/test/API/benchmarks/expression/Makefile rename from lldb/packages/Python/lldbsuite/test/benchmarks/expression/Makefile rename to lldb/test/API/benchmarks/expression/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py b/lldb/test/API/benchmarks/expression/TestExpressionCmd.py rename from lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py rename to lldb/test/API/benchmarks/expression/TestExpressionCmd.py diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/test/API/benchmarks/expression/TestRepeatedExprs.py rename from lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py rename to lldb/test/API/benchmarks/expression/TestRepeatedExprs.py diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/main.cpp b/lldb/test/API/benchmarks/expression/main.cpp rename from lldb/packages/Python/lldbsuite/test/benchmarks/expression/main.cpp rename to lldb/test/API/benchmarks/expression/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py rename from lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py rename to lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/Makefile b/lldb/test/API/benchmarks/libcxxlist/Makefile rename from lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/Makefile rename to lldb/test/API/benchmarks/libcxxlist/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py b/lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py rename from lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py rename to lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/main.cpp b/lldb/test/API/benchmarks/libcxxlist/main.cpp rename from lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/main.cpp rename to lldb/test/API/benchmarks/libcxxlist/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/Makefile b/lldb/test/API/benchmarks/libcxxmap/Makefile rename from lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/Makefile rename to lldb/test/API/benchmarks/libcxxmap/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py b/lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py rename from lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py rename to lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/main.cpp b/lldb/test/API/benchmarks/libcxxmap/main.cpp rename from lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/main.cpp rename to lldb/test/API/benchmarks/libcxxmap/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py b/lldb/test/API/benchmarks/startup/TestStartupDelays.py rename from lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py rename to lldb/test/API/benchmarks/startup/TestStartupDelays.py diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py rename from lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py rename to lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py rename from lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py rename to lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile b/lldb/test/API/commands/add-dsym/uuid/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile rename to lldb/test/API/commands/add-dsym/uuid/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/TestAddDsymCommand.py b/lldb/test/API/commands/add-dsym/uuid/TestAddDsymCommand.py rename from lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/TestAddDsymCommand.py rename to lldb/test/API/commands/add-dsym/uuid/TestAddDsymCommand.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/main.cpp.template b/lldb/test/API/commands/add-dsym/uuid/main.cpp.template rename from lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/main.cpp.template rename to lldb/test/API/commands/add-dsym/uuid/main.cpp.template diff --git a/lldb/packages/Python/lldbsuite/test/commands/apropos/basic/TestApropos.py b/lldb/test/API/commands/apropos/basic/TestApropos.py rename from lldb/packages/Python/lldbsuite/test/commands/apropos/basic/TestApropos.py rename to lldb/test/API/commands/apropos/basic/TestApropos.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile b/lldb/test/API/commands/apropos/with-process/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile rename to lldb/test/API/commands/apropos/with-process/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py b/lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py rename from lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py rename to lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/main.cpp b/lldb/test/API/commands/apropos/with-process/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/main.cpp rename to lldb/test/API/commands/apropos/with-process/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/breakpoint/command/list/TestBreakpointCommandList.py b/lldb/test/API/commands/breakpoint/command/list/TestBreakpointCommandList.py rename from lldb/packages/Python/lldbsuite/test/commands/breakpoint/command/list/TestBreakpointCommandList.py rename to lldb/test/API/commands/breakpoint/command/list/TestBreakpointCommandList.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/breakpoint/command/list/a.yaml b/lldb/test/API/commands/breakpoint/command/list/a.yaml rename from lldb/packages/Python/lldbsuite/test/commands/breakpoint/command/list/a.yaml rename to lldb/test/API/commands/breakpoint/command/list/a.yaml diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/.categories b/lldb/test/API/commands/command/.categories rename from lldb/packages/Python/lldbsuite/test/commands/command/.categories rename to lldb/test/API/commands/command/.categories diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/delete/TestCommandDelete.py b/lldb/test/API/commands/command/delete/TestCommandDelete.py rename from lldb/packages/Python/lldbsuite/test/commands/command/delete/TestCommandDelete.py rename to lldb/test/API/commands/command/delete/TestCommandDelete.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/history/TestCommandHistory.py b/lldb/test/API/commands/command/history/TestCommandHistory.py rename from lldb/packages/Python/lldbsuite/test/commands/command/history/TestCommandHistory.py rename to lldb/test/API/commands/command/history/TestCommandHistory.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/invalid-args/TestInvalidArgsCommand.py b/lldb/test/API/commands/command/invalid-args/TestInvalidArgsCommand.py rename from lldb/packages/Python/lldbsuite/test/commands/command/invalid-args/TestInvalidArgsCommand.py rename to lldb/test/API/commands/command/invalid-args/TestInvalidArgsCommand.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile b/lldb/test/API/commands/command/nested_alias/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile rename to lldb/test/API/commands/command/nested_alias/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py b/lldb/test/API/commands/command/nested_alias/TestNestedAlias.py rename from lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py rename to lldb/test/API/commands/command/nested_alias/TestNestedAlias.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/main.cpp b/lldb/test/API/commands/command/nested_alias/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/main.cpp rename to lldb/test/API/commands/command/nested_alias/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile b/lldb/test/API/commands/command/script/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile rename to lldb/test/API/commands/command/script/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/TestCommandScript.py b/lldb/test/API/commands/command/script/TestCommandScript.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/TestCommandScript.py rename to lldb/test/API/commands/command/script/TestCommandScript.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/bug11569.py b/lldb/test/API/commands/command/script/bug11569.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/bug11569.py rename to lldb/test/API/commands/command/script/bug11569.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/callables.py b/lldb/test/API/commands/command/script/callables.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/callables.py rename to lldb/test/API/commands/command/script/callables.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/decorated.py b/lldb/test/API/commands/command/script/decorated.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/decorated.py rename to lldb/test/API/commands/command/script/decorated.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile b/lldb/test/API/commands/command/script/import/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile rename to lldb/test/API/commands/command/script/import/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/TestImport.py b/lldb/test/API/commands/command/script/import/TestImport.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/TestImport.py rename to lldb/test/API/commands/command/script/import/TestImport.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/bar/bar.py b/lldb/test/API/commands/command/script/import/bar/bar.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/bar/bar.py rename to lldb/test/API/commands/command/script/import/bar/bar.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/bar/barutil.py b/lldb/test/API/commands/command/script/import/bar/barutil.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/bar/barutil.py rename to lldb/test/API/commands/command/script/import/bar/barutil.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/dummymodule.py b/lldb/test/API/commands/command/script/import/dummymodule.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/dummymodule.py rename to lldb/test/API/commands/command/script/import/dummymodule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/bar/foobar.py b/lldb/test/API/commands/command/script/import/foo/bar/foobar.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/bar/foobar.py rename to lldb/test/API/commands/command/script/import/foo/bar/foobar.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/foo.py b/lldb/test/API/commands/command/script/import/foo/foo.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/foo.py rename to lldb/test/API/commands/command/script/import/foo/foo.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/foo2.py b/lldb/test/API/commands/command/script/import/foo/foo2.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/foo2.py rename to lldb/test/API/commands/command/script/import/foo/foo2.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/main.c b/lldb/test/API/commands/command/script/import/main.c rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/main.c rename to lldb/test/API/commands/command/script/import/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile b/lldb/test/API/commands/command/script/import/rdar-12586188/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile rename to lldb/test/API/commands/command/script/import/rdar-12586188/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/TestRdar12586188.py b/lldb/test/API/commands/command/script/import/rdar-12586188/TestRdar12586188.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/TestRdar12586188.py rename to lldb/test/API/commands/command/script/import/rdar-12586188/TestRdar12586188.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/fail12586188.py b/lldb/test/API/commands/command/script/import/rdar-12586188/fail12586188.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/fail12586188.py rename to lldb/test/API/commands/command/script/import/rdar-12586188/fail12586188.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/fail212586188.py b/lldb/test/API/commands/command/script/import/rdar-12586188/fail212586188.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/fail212586188.py rename to lldb/test/API/commands/command/script/import/rdar-12586188/fail212586188.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/TPunitA.py b/lldb/test/API/commands/command/script/import/thepackage/TPunitA.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/TPunitA.py rename to lldb/test/API/commands/command/script/import/thepackage/TPunitA.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/TPunitB.py b/lldb/test/API/commands/command/script/import/thepackage/TPunitB.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/TPunitB.py rename to lldb/test/API/commands/command/script/import/thepackage/TPunitB.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/__init__.py b/lldb/test/API/commands/command/script/import/thepackage/__init__.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/__init__.py rename to lldb/test/API/commands/command/script/import/thepackage/__init__.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/main.cpp b/lldb/test/API/commands/command/script/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/command/script/main.cpp rename to lldb/test/API/commands/command/script/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/mysto.py b/lldb/test/API/commands/command/script/mysto.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/mysto.py rename to lldb/test/API/commands/command/script/mysto.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/py_import b/lldb/test/API/commands/command/script/py_import rename from lldb/packages/Python/lldbsuite/test/commands/command/script/py_import rename to lldb/test/API/commands/command/script/py_import diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/welcome.py b/lldb/test/API/commands/command/script/welcome.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script/welcome.py rename to lldb/test/API/commands/command/script/welcome.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py b/lldb/test/API/commands/command/script_alias/TestCommandScriptAlias.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py rename to lldb/test/API/commands/command/script_alias/TestCommandScriptAlias.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/tcsacmd.py b/lldb/test/API/commands/command/script_alias/tcsacmd.py rename from lldb/packages/Python/lldbsuite/test/commands/command/script_alias/tcsacmd.py rename to lldb/test/API/commands/command/script_alias/tcsacmd.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/source/.lldb b/lldb/test/API/commands/command/source/.lldb rename from lldb/packages/Python/lldbsuite/test/commands/command/source/.lldb rename to lldb/test/API/commands/command/source/.lldb diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/source/TestCommandSource.py b/lldb/test/API/commands/command/source/TestCommandSource.py rename from lldb/packages/Python/lldbsuite/test/commands/command/source/TestCommandSource.py rename to lldb/test/API/commands/command/source/TestCommandSource.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/source/commands.txt b/lldb/test/API/commands/command/source/commands.txt rename from lldb/packages/Python/lldbsuite/test/commands/command/source/commands.txt rename to lldb/test/API/commands/command/source/commands.txt diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/source/my.py b/lldb/test/API/commands/command/source/my.py rename from lldb/packages/Python/lldbsuite/test/commands/command/source/my.py rename to lldb/test/API/commands/command/source/my.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile b/lldb/test/API/commands/disassemble/basic/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile rename to lldb/test/API/commands/disassemble/basic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestDisassembleBreakpoint.py b/lldb/test/API/commands/disassemble/basic/TestDisassembleBreakpoint.py rename from lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestDisassembleBreakpoint.py rename to lldb/test/API/commands/disassemble/basic/TestDisassembleBreakpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestFrameDisassemble.py b/lldb/test/API/commands/disassemble/basic/TestFrameDisassemble.py rename from lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestFrameDisassemble.py rename to lldb/test/API/commands/disassemble/basic/TestFrameDisassemble.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/main.cpp b/lldb/test/API/commands/disassemble/basic/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/main.cpp rename to lldb/test/API/commands/disassemble/basic/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/.categories b/lldb/test/API/commands/expression/.categories rename from lldb/packages/Python/lldbsuite/test/commands/expression/.categories rename to lldb/test/API/commands/expression/.categories diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile b/lldb/test/API/commands/expression/anonymous-struct/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile rename to lldb/test/API/commands/expression/anonymous-struct/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py b/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py rename to lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/main.cpp b/lldb/test/API/commands/expression/anonymous-struct/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/main.cpp rename to lldb/test/API/commands/expression/anonymous-struct/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile b/lldb/test/API/commands/expression/argument_passing_restrictions/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile rename to lldb/test/API/commands/expression/argument_passing_restrictions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py b/lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py rename to lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/main.cpp b/lldb/test/API/commands/expression/argument_passing_restrictions/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/main.cpp rename to lldb/test/API/commands/expression/argument_passing_restrictions/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py b/lldb/test/API/commands/expression/calculator_mode/TestCalculatorMode.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py rename to lldb/test/API/commands/expression/calculator_mode/TestCalculatorMode.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile b/lldb/test/API/commands/expression/call-function/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile rename to lldb/test/API/commands/expression/call-function/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallBuiltinFunction.py b/lldb/test/API/commands/expression/call-function/TestCallBuiltinFunction.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallBuiltinFunction.py rename to lldb/test/API/commands/expression/call-function/TestCallBuiltinFunction.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStdStringFunction.py b/lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStdStringFunction.py rename to lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStopAndContinue.py b/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStopAndContinue.py rename to lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallUserDefinedFunction.py b/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallUserDefinedFunction.py rename to lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/main.cpp b/lldb/test/API/commands/expression/call-function/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-function/main.cpp rename to lldb/test/API/commands/expression/call-function/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile b/lldb/test/API/commands/expression/call-restarts/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile rename to lldb/test/API/commands/expression/call-restarts/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/TestCallThatRestarts.py b/lldb/test/API/commands/expression/call-restarts/TestCallThatRestarts.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/TestCallThatRestarts.py rename to lldb/test/API/commands/expression/call-restarts/TestCallThatRestarts.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/lotta-signals.c b/lldb/test/API/commands/expression/call-restarts/lotta-signals.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/lotta-signals.c rename to lldb/test/API/commands/expression/call-restarts/lotta-signals.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile b/lldb/test/API/commands/expression/call-throws/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile rename to lldb/test/API/commands/expression/call-throws/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/TestCallThatThrows.py b/lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/TestCallThatThrows.py rename to lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/call-throws.m b/lldb/test/API/commands/expression/call-throws/call-throws.m rename from lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/call-throws.m rename to lldb/test/API/commands/expression/call-throws/call-throws.m diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile b/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile rename to lldb/test/API/commands/expression/cast_int_to_anonymous_enum/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py b/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py rename to lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/main.cpp b/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/main.cpp rename to lldb/test/API/commands/expression/cast_int_to_anonymous_enum/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile b/lldb/test/API/commands/expression/char/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile rename to lldb/test/API/commands/expression/char/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/char/TestExprsChar.py b/lldb/test/API/commands/expression/char/TestExprsChar.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/char/TestExprsChar.py rename to lldb/test/API/commands/expression/char/TestExprsChar.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/char/main.cpp b/lldb/test/API/commands/expression/char/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/char/main.cpp rename to lldb/test/API/commands/expression/char/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile b/lldb/test/API/commands/expression/class_template_specialization_empty_pack/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile rename to lldb/test/API/commands/expression/class_template_specialization_empty_pack/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py b/lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py rename to lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/main.cpp b/lldb/test/API/commands/expression/class_template_specialization_empty_pack/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/main.cpp rename to lldb/test/API/commands/expression/class_template_specialization_empty_pack/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/TestCodegenCrashTypedefDeclNotInDeclContext.py b/lldb/test/API/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/TestCodegenCrashTypedefDeclNotInDeclContext.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/TestCodegenCrashTypedefDeclNotInDeclContext.py rename to lldb/test/API/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/TestCodegenCrashTypedefDeclNotInDeclContext.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/main.cpp b/lldb/test/API/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/main.cpp rename to lldb/test/API/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py b/lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py rename to lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/main.cpp b/lldb/test/API/commands/expression/completion-crash-incomplete-record/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/main.cpp rename to lldb/test/API/commands/expression/completion-crash-incomplete-record/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-invalid-iterator/Makefile b/lldb/test/API/commands/expression/completion-crash-invalid-iterator/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-invalid-iterator/Makefile rename to lldb/test/API/commands/expression/completion-crash-invalid-iterator/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py b/lldb/test/API/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py rename to lldb/test/API/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-invalid-iterator/main.cpp b/lldb/test/API/commands/expression/completion-crash-invalid-iterator/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-invalid-iterator/main.cpp rename to lldb/test/API/commands/expression/completion-crash-invalid-iterator/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py b/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py rename to lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-in-lambda-and-unnamed-class/main.cpp b/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion-in-lambda-and-unnamed-class/main.cpp rename to lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/.categories b/lldb/test/API/commands/expression/completion/.categories rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion/.categories rename to lldb/test/API/commands/expression/completion/.categories diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile b/lldb/test/API/commands/expression/completion/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile rename to lldb/test/API/commands/expression/completion/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/TestExprCompletion.py b/lldb/test/API/commands/expression/completion/TestExprCompletion.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion/TestExprCompletion.py rename to lldb/test/API/commands/expression/completion/TestExprCompletion.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/main.cpp b/lldb/test/API/commands/expression/completion/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion/main.cpp rename to lldb/test/API/commands/expression/completion/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/other.cpp b/lldb/test/API/commands/expression/completion/other.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/completion/other.cpp rename to lldb/test/API/commands/expression/completion/other.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile b/lldb/test/API/commands/expression/context-object-objc/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile rename to lldb/test/API/commands/expression/context-object-objc/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/TestContextObjectObjc.py b/lldb/test/API/commands/expression/context-object-objc/TestContextObjectObjc.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/TestContextObjectObjc.py rename to lldb/test/API/commands/expression/context-object-objc/TestContextObjectObjc.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/main.m b/lldb/test/API/commands/expression/context-object-objc/main.m rename from lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/main.m rename to lldb/test/API/commands/expression/context-object-objc/main.m diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile b/lldb/test/API/commands/expression/context-object/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile rename to lldb/test/API/commands/expression/context-object/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/TestContextObject.py b/lldb/test/API/commands/expression/context-object/TestContextObject.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/context-object/TestContextObject.py rename to lldb/test/API/commands/expression/context-object/TestContextObject.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/main.cpp b/lldb/test/API/commands/expression/context-object/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/context-object/main.cpp rename to lldb/test/API/commands/expression/context-object/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py b/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py rename to lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/deleting-implicit-copy-constructor/main.cpp b/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/deleting-implicit-copy-constructor/main.cpp rename to lldb/test/API/commands/expression/deleting-implicit-copy-constructor/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/diagnostics/Makefile b/lldb/test/API/commands/expression/diagnostics/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/diagnostics/Makefile rename to lldb/test/API/commands/expression/diagnostics/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/diagnostics/TestExprDiagnostics.py b/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/diagnostics/TestExprDiagnostics.py rename to lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/diagnostics/main.cpp b/lldb/test/API/commands/expression/diagnostics/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/diagnostics/main.cpp rename to lldb/test/API/commands/expression/diagnostics/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/TestDollarInVariable.py b/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/TestDollarInVariable.py rename to lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/main.c b/lldb/test/API/commands/expression/dollar-in-variable/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/main.c rename to lldb/test/API/commands/expression/dollar-in-variable/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile b/lldb/test/API/commands/expression/dont_allow_jit/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile rename to lldb/test/API/commands/expression/dont_allow_jit/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/TestAllowJIT.py b/lldb/test/API/commands/expression/dont_allow_jit/TestAllowJIT.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/TestAllowJIT.py rename to lldb/test/API/commands/expression/dont_allow_jit/TestAllowJIT.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/main.c b/lldb/test/API/commands/expression/dont_allow_jit/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/main.c rename to lldb/test/API/commands/expression/dont_allow_jit/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile b/lldb/test/API/commands/expression/entry-bp/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile rename to lldb/test/API/commands/expression/entry-bp/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/TestExprEntryBP.py b/lldb/test/API/commands/expression/entry-bp/TestExprEntryBP.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/TestExprEntryBP.py rename to lldb/test/API/commands/expression/entry-bp/TestExprEntryBP.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/main.c b/lldb/test/API/commands/expression/entry-bp/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/main.c rename to lldb/test/API/commands/expression/entry-bp/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile b/lldb/test/API/commands/expression/expr-in-syscall/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile rename to lldb/test/API/commands/expression/expr-in-syscall/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/TestExpressionInSyscall.py b/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/TestExpressionInSyscall.py rename to lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/main.cpp b/lldb/test/API/commands/expression/expr-in-syscall/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/main.cpp rename to lldb/test/API/commands/expression/expr-in-syscall/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile b/lldb/test/API/commands/expression/fixits/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile rename to lldb/test/API/commands/expression/fixits/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/TestFixIts.py b/lldb/test/API/commands/expression/fixits/TestFixIts.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/fixits/TestFixIts.py rename to lldb/test/API/commands/expression/fixits/TestFixIts.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/main.cpp b/lldb/test/API/commands/expression/fixits/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/fixits/main.cpp rename to lldb/test/API/commands/expression/fixits/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile b/lldb/test/API/commands/expression/formatters/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile rename to lldb/test/API/commands/expression/formatters/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py b/lldb/test/API/commands/expression/formatters/TestFormatters.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py rename to lldb/test/API/commands/expression/formatters/TestFormatters.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/foosynth.py b/lldb/test/API/commands/expression/formatters/foosynth.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/formatters/foosynth.py rename to lldb/test/API/commands/expression/formatters/foosynth.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/formatters.py b/lldb/test/API/commands/expression/formatters/formatters.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/formatters/formatters.py rename to lldb/test/API/commands/expression/formatters/formatters.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp b/lldb/test/API/commands/expression/formatters/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp rename to lldb/test/API/commands/expression/formatters/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile b/lldb/test/API/commands/expression/function_template_specialization_temp_args/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile rename to lldb/test/API/commands/expression/function_template_specialization_temp_args/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py b/lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py rename to lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/main.cpp b/lldb/test/API/commands/expression/function_template_specialization_temp_args/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/main.cpp rename to lldb/test/API/commands/expression/function_template_specialization_temp_args/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ignore-artificial-constructors/TestIgnoreArtificialConstructors.py b/lldb/test/API/commands/expression/ignore-artificial-constructors/TestIgnoreArtificialConstructors.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/ignore-artificial-constructors/TestIgnoreArtificialConstructors.py rename to lldb/test/API/commands/expression/ignore-artificial-constructors/TestIgnoreArtificialConstructors.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ignore-artificial-constructors/main.cpp b/lldb/test/API/commands/expression/ignore-artificial-constructors/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/ignore-artificial-constructors/main.cpp rename to lldb/test/API/commands/expression/ignore-artificial-constructors/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile b/lldb/test/API/commands/expression/import-std-module/basic/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile rename to lldb/test/API/commands/expression/import-std-module/basic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/TestImportStdModule.py b/lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/TestImportStdModule.py rename to lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/main.cpp b/lldb/test/API/commands/expression/import-std-module/basic/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/main.cpp rename to lldb/test/API/commands/expression/import-std-module/basic/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile b/lldb/test/API/commands/expression/import-std-module/conflicts/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile rename to lldb/test/API/commands/expression/import-std-module/conflicts/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py b/lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py rename to lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/main.cpp b/lldb/test/API/commands/expression/import-std-module/conflicts/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/main.cpp rename to lldb/test/API/commands/expression/import-std-module/conflicts/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile b/lldb/test/API/commands/expression/import-std-module/deque-basic/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile rename to lldb/test/API/commands/expression/import-std-module/deque-basic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/main.cpp b/lldb/test/API/commands/expression/import-std-module/deque-basic/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/main.cpp rename to lldb/test/API/commands/expression/import-std-module/deque-basic/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile b/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile rename to lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/main.cpp b/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/main.cpp rename to lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/Makefile b/lldb/test/API/commands/expression/import-std-module/empty-module/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/Makefile rename to lldb/test/API/commands/expression/import-std-module/empty-module/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py b/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py rename to lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/main.cpp b/lldb/test/API/commands/expression/import-std-module/empty-module/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/main.cpp rename to lldb/test/API/commands/expression/import-std-module/empty-module/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/root/usr/include/c++/v1/algorithm b/lldb/test/API/commands/expression/import-std-module/empty-module/root/usr/include/c++/v1/algorithm rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/root/usr/include/c++/v1/algorithm rename to lldb/test/API/commands/expression/import-std-module/empty-module/root/usr/include/c++/v1/algorithm diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/root/usr/include/c++/v1/module.modulemap b/lldb/test/API/commands/expression/import-std-module/empty-module/root/usr/include/c++/v1/module.modulemap rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/root/usr/include/c++/v1/module.modulemap rename to lldb/test/API/commands/expression/import-std-module/empty-module/root/usr/include/c++/v1/module.modulemap diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/root/usr/include/libc_header.h b/lldb/test/API/commands/expression/import-std-module/empty-module/root/usr/include/libc_header.h rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/empty-module/root/usr/include/libc_header.h rename to lldb/test/API/commands/expression/import-std-module/empty-module/root/usr/include/libc_header.h diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile b/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile rename to lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/main.cpp b/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/main.cpp rename to lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list/Makefile b/lldb/test/API/commands/expression/import-std-module/forward_list/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list/Makefile rename to lldb/test/API/commands/expression/import-std-module/forward_list/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list/main.cpp b/lldb/test/API/commands/expression/import-std-module/forward_list/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list/main.cpp rename to lldb/test/API/commands/expression/import-std-module/forward_list/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile b/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile rename to lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/main.cpp b/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/main.cpp rename to lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list/Makefile b/lldb/test/API/commands/expression/import-std-module/list/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list/Makefile rename to lldb/test/API/commands/expression/import-std-module/list/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list/TestListFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list/TestListFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list/main.cpp b/lldb/test/API/commands/expression/import-std-module/list/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list/main.cpp rename to lldb/test/API/commands/expression/import-std-module/list/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile b/lldb/test/API/commands/expression/import-std-module/no-std-module/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile rename to lldb/test/API/commands/expression/import-std-module/no-std-module/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py b/lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py rename to lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/main.cpp b/lldb/test/API/commands/expression/import-std-module/no-std-module/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/main.cpp rename to lldb/test/API/commands/expression/import-std-module/no-std-module/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile b/lldb/test/API/commands/expression/import-std-module/queue/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile rename to lldb/test/API/commands/expression/import-std-module/queue/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/TestQueueFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/TestQueueFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/main.cpp b/lldb/test/API/commands/expression/import-std-module/queue/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/main.cpp rename to lldb/test/API/commands/expression/import-std-module/queue/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile b/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile rename to lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/main.cpp b/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/main.cpp rename to lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile b/lldb/test/API/commands/expression/import-std-module/shared_ptr/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile rename to lldb/test/API/commands/expression/import-std-module/shared_ptr/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/main.cpp b/lldb/test/API/commands/expression/import-std-module/shared_ptr/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/main.cpp rename to lldb/test/API/commands/expression/import-std-module/shared_ptr/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile b/lldb/test/API/commands/expression/import-std-module/stack/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile rename to lldb/test/API/commands/expression/import-std-module/stack/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/TestStackFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/TestStackFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/main.cpp b/lldb/test/API/commands/expression/import-std-module/stack/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/main.cpp rename to lldb/test/API/commands/expression/import-std-module/stack/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile b/lldb/test/API/commands/expression/import-std-module/sysroot/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile rename to lldb/test/API/commands/expression/import-std-module/sysroot/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py b/lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py rename to lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/main.cpp b/lldb/test/API/commands/expression/import-std-module/sysroot/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/main.cpp rename to lldb/test/API/commands/expression/import-std-module/sysroot/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/c++/v1/algorithm b/lldb/test/API/commands/expression/import-std-module/sysroot/root/usr/include/c++/v1/algorithm rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/c++/v1/algorithm rename to lldb/test/API/commands/expression/import-std-module/sysroot/root/usr/include/c++/v1/algorithm diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/c++/v1/module.modulemap b/lldb/test/API/commands/expression/import-std-module/sysroot/root/usr/include/c++/v1/module.modulemap rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/c++/v1/module.modulemap rename to lldb/test/API/commands/expression/import-std-module/sysroot/root/usr/include/c++/v1/module.modulemap diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/libc_header.h b/lldb/test/API/commands/expression/import-std-module/sysroot/root/usr/include/libc_header.h rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/libc_header.h rename to lldb/test/API/commands/expression/import-std-module/sysroot/root/usr/include/libc_header.h diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile b/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile rename to lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py b/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py rename to lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/main.cpp b/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/main.cpp rename to lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile b/lldb/test/API/commands/expression/import-std-module/unique_ptr/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile rename to lldb/test/API/commands/expression/import-std-module/unique_ptr/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/main.cpp b/lldb/test/API/commands/expression/import-std-module/unique_ptr/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/main.cpp rename to lldb/test/API/commands/expression/import-std-module/unique_ptr/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile b/lldb/test/API/commands/expression/import-std-module/vector-bool/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile rename to lldb/test/API/commands/expression/import-std-module/vector-bool/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/main.cpp b/lldb/test/API/commands/expression/import-std-module/vector-bool/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/main.cpp rename to lldb/test/API/commands/expression/import-std-module/vector-bool/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile rename to lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/main.cpp b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/main.cpp rename to lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile rename to lldb/test/API/commands/expression/import-std-module/vector-of-vectors/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/main.cpp b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/main.cpp rename to lldb/test/API/commands/expression/import-std-module/vector-of-vectors/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector/Makefile b/lldb/test/API/commands/expression/import-std-module/vector/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector/Makefile rename to lldb/test/API/commands/expression/import-std-module/vector/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector/TestVectorFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector/TestVectorFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector/main.cpp b/lldb/test/API/commands/expression/import-std-module/vector/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector/main.cpp rename to lldb/test/API/commands/expression/import-std-module/vector/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile b/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile rename to lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/main.cpp b/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/main.cpp rename to lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile b/lldb/test/API/commands/expression/import-std-module/weak_ptr/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile rename to lldb/test/API/commands/expression/import-std-module/weak_ptr/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py rename to lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/main.cpp b/lldb/test/API/commands/expression/import-std-module/weak_ptr/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/main.cpp rename to lldb/test/API/commands/expression/import-std-module/weak_ptr/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile b/lldb/test/API/commands/expression/import_builtin_fileid/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile rename to lldb/test/API/commands/expression/import_builtin_fileid/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py b/lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py rename to lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/main.m b/lldb/test/API/commands/expression/import_builtin_fileid/main.m rename from lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/main.m rename to lldb/test/API/commands/expression/import_builtin_fileid/main.m diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile b/lldb/test/API/commands/expression/inline-namespace/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile rename to lldb/test/API/commands/expression/inline-namespace/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/TestInlineNamespace.py b/lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/TestInlineNamespace.py rename to lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/main.cpp b/lldb/test/API/commands/expression/inline-namespace/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/main.cpp rename to lldb/test/API/commands/expression/inline-namespace/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/invalid-args/TestInvalidArgsExpression.py b/lldb/test/API/commands/expression/invalid-args/TestInvalidArgsExpression.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/invalid-args/TestInvalidArgsExpression.py rename to lldb/test/API/commands/expression/invalid-args/TestInvalidArgsExpression.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile rename to lldb/test/API/commands/expression/ir-interpreter-phi-nodes/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py rename to lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/main.cpp b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/main.cpp rename to lldb/test/API/commands/expression/ir-interpreter-phi-nodes/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile b/lldb/test/API/commands/expression/ir-interpreter/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile rename to lldb/test/API/commands/expression/ir-interpreter/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/TestIRInterpreter.py b/lldb/test/API/commands/expression/ir-interpreter/TestIRInterpreter.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/TestIRInterpreter.py rename to lldb/test/API/commands/expression/ir-interpreter/TestIRInterpreter.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/main.c b/lldb/test/API/commands/expression/ir-interpreter/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/main.c rename to lldb/test/API/commands/expression/ir-interpreter/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile b/lldb/test/API/commands/expression/issue_11588/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile rename to lldb/test/API/commands/expression/issue_11588/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Test11588.py b/lldb/test/API/commands/expression/issue_11588/Test11588.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Test11588.py rename to lldb/test/API/commands/expression/issue_11588/Test11588.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/main.cpp b/lldb/test/API/commands/expression/issue_11588/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/main.cpp rename to lldb/test/API/commands/expression/issue_11588/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/s11588.py b/lldb/test/API/commands/expression/issue_11588/s11588.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/s11588.py rename to lldb/test/API/commands/expression/issue_11588/s11588.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile b/lldb/test/API/commands/expression/macros/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile rename to lldb/test/API/commands/expression/macros/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/TestMacros.py b/lldb/test/API/commands/expression/macros/TestMacros.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/macros/TestMacros.py rename to lldb/test/API/commands/expression/macros/TestMacros.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/macro1.h b/lldb/test/API/commands/expression/macros/macro1.h rename from lldb/packages/Python/lldbsuite/test/commands/expression/macros/macro1.h rename to lldb/test/API/commands/expression/macros/macro1.h diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/macro2.h b/lldb/test/API/commands/expression/macros/macro2.h rename from lldb/packages/Python/lldbsuite/test/commands/expression/macros/macro2.h rename to lldb/test/API/commands/expression/macros/macro2.h diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/main.cpp b/lldb/test/API/commands/expression/macros/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/macros/main.cpp rename to lldb/test/API/commands/expression/macros/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile b/lldb/test/API/commands/expression/multiline-completion/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile rename to lldb/test/API/commands/expression/multiline-completion/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/TestMultilineCompletion.py b/lldb/test/API/commands/expression/multiline-completion/TestMultilineCompletion.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/TestMultilineCompletion.py rename to lldb/test/API/commands/expression/multiline-completion/TestMultilineCompletion.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/main.c b/lldb/test/API/commands/expression/multiline-completion/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/main.c rename to lldb/test/API/commands/expression/multiline-completion/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-navigation/TestMultilineNavigation.py b/lldb/test/API/commands/expression/multiline-navigation/TestMultilineNavigation.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/multiline-navigation/TestMultilineNavigation.py rename to lldb/test/API/commands/expression/multiline-navigation/TestMultilineNavigation.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile b/lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile rename to lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py b/lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py rename to lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/main.cpp b/lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/main.cpp rename to lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile b/lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile rename to lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py b/lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py rename to lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/main.mm b/lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/main.mm rename from lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/main.mm rename to lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/util.mm b/lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/util.mm rename from lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/util.mm rename to lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/util.mm diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile b/lldb/test/API/commands/expression/no-deadlock/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile rename to lldb/test/API/commands/expression/no-deadlock/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/TestExprDoesntBlock.py b/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/TestExprDoesntBlock.py rename to lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/locking.cpp b/lldb/test/API/commands/expression/no-deadlock/locking.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/locking.cpp rename to lldb/test/API/commands/expression/no-deadlock/locking.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile b/lldb/test/API/commands/expression/options/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile rename to lldb/test/API/commands/expression/options/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/options/TestExprOptions.py b/lldb/test/API/commands/expression/options/TestExprOptions.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/options/TestExprOptions.py rename to lldb/test/API/commands/expression/options/TestExprOptions.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/options/foo.cpp b/lldb/test/API/commands/expression/options/foo.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/options/foo.cpp rename to lldb/test/API/commands/expression/options/foo.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/options/main.cpp b/lldb/test/API/commands/expression/options/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/options/main.cpp rename to lldb/test/API/commands/expression/options/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile b/lldb/test/API/commands/expression/persist_objc_pointeetype/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile rename to lldb/test/API/commands/expression/persist_objc_pointeetype/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py rename to lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/main.m b/lldb/test/API/commands/expression/persist_objc_pointeetype/main.m rename from lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/main.m rename to lldb/test/API/commands/expression/persist_objc_pointeetype/main.m diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile b/lldb/test/API/commands/expression/persistent_ptr_update/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile rename to lldb/test/API/commands/expression/persistent_ptr_update/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py rename to lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/main.c b/lldb/test/API/commands/expression/persistent_ptr_update/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/main.c rename to lldb/test/API/commands/expression/persistent_ptr_update/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile b/lldb/test/API/commands/expression/persistent_types/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile rename to lldb/test/API/commands/expression/persistent_types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestNestedPersistentTypes.py b/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestNestedPersistentTypes.py rename to lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestPersistentTypes.py b/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestPersistentTypes.py rename to lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/main.c b/lldb/test/API/commands/expression/persistent_types/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/main.c rename to lldb/test/API/commands/expression/persistent_types/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile b/lldb/test/API/commands/expression/persistent_variables/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile rename to lldb/test/API/commands/expression/persistent_variables/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py b/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py rename to lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/main.c b/lldb/test/API/commands/expression/persistent_variables/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/main.c rename to lldb/test/API/commands/expression/persistent_variables/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile b/lldb/test/API/commands/expression/po_verbosity/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile rename to lldb/test/API/commands/expression/po_verbosity/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/TestPoVerbosity.py b/lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/TestPoVerbosity.py rename to lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/main.m b/lldb/test/API/commands/expression/po_verbosity/main.m rename from lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/main.m rename to lldb/test/API/commands/expression/po_verbosity/main.m diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile b/lldb/test/API/commands/expression/pr35310/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile rename to lldb/test/API/commands/expression/pr35310/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/TestExprsBug35310.py b/lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/TestExprsBug35310.py rename to lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/main.cpp b/lldb/test/API/commands/expression/pr35310/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/main.cpp rename to lldb/test/API/commands/expression/pr35310/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile b/lldb/test/API/commands/expression/radar_8638051/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile rename to lldb/test/API/commands/expression/radar_8638051/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Test8638051.py b/lldb/test/API/commands/expression/radar_8638051/Test8638051.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Test8638051.py rename to lldb/test/API/commands/expression/radar_8638051/Test8638051.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/main.c b/lldb/test/API/commands/expression/radar_8638051/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/main.c rename to lldb/test/API/commands/expression/radar_8638051/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile b/lldb/test/API/commands/expression/radar_9531204/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile rename to lldb/test/API/commands/expression/radar_9531204/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/TestPrintfAfterUp.py b/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/TestPrintfAfterUp.py rename to lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/main.c b/lldb/test/API/commands/expression/radar_9531204/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/main.c rename to lldb/test/API/commands/expression/radar_9531204/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile b/lldb/test/API/commands/expression/radar_9673664/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile rename to lldb/test/API/commands/expression/radar_9673664/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/TestExprHelpExamples.py b/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/TestExprHelpExamples.py rename to lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/main.c b/lldb/test/API/commands/expression/radar_9673664/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/main.c rename to lldb/test/API/commands/expression/radar_9673664/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/TestScalarURem.py b/lldb/test/API/commands/expression/rdar42038760/TestScalarURem.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/TestScalarURem.py rename to lldb/test/API/commands/expression/rdar42038760/TestScalarURem.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/main.c b/lldb/test/API/commands/expression/rdar42038760/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/main.c rename to lldb/test/API/commands/expression/rdar42038760/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Test128BitsInteger.py b/lldb/test/API/commands/expression/rdar44436068/Test128BitsInteger.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Test128BitsInteger.py rename to lldb/test/API/commands/expression/rdar44436068/Test128BitsInteger.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/main.c b/lldb/test/API/commands/expression/rdar44436068/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/main.c rename to lldb/test/API/commands/expression/rdar44436068/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py b/lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py rename to lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/regression-access-function-template-in-record/main.cpp b/lldb/test/API/commands/expression/regression-access-function-template-in-record/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/regression-access-function-template-in-record/main.cpp rename to lldb/test/API/commands/expression/regression-access-function-template-in-record/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile b/lldb/test/API/commands/expression/save_jit_objects/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile rename to lldb/test/API/commands/expression/save_jit_objects/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/TestSaveJITObjects.py b/lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/TestSaveJITObjects.py rename to lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/main.c b/lldb/test/API/commands/expression/save_jit_objects/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/main.c rename to lldb/test/API/commands/expression/save_jit_objects/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile b/lldb/test/API/commands/expression/scoped_enums/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile rename to lldb/test/API/commands/expression/scoped_enums/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/TestScopedEnumType.py b/lldb/test/API/commands/expression/scoped_enums/TestScopedEnumType.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/TestScopedEnumType.py rename to lldb/test/API/commands/expression/scoped_enums/TestScopedEnumType.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/main.cpp b/lldb/test/API/commands/expression/scoped_enums/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/main.cpp rename to lldb/test/API/commands/expression/scoped_enums/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/static-initializers/Makefile b/lldb/test/API/commands/expression/static-initializers/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/static-initializers/Makefile rename to lldb/test/API/commands/expression/static-initializers/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/static-initializers/TestStaticInitializers.py b/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/static-initializers/TestStaticInitializers.py rename to lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/static-initializers/main.cpp b/lldb/test/API/commands/expression/static-initializers/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/static-initializers/main.cpp rename to lldb/test/API/commands/expression/static-initializers/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile b/lldb/test/API/commands/expression/test/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile rename to lldb/test/API/commands/expression/test/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs.py b/lldb/test/API/commands/expression/test/TestExprs.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs.py rename to lldb/test/API/commands/expression/test/TestExprs.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs2.py b/lldb/test/API/commands/expression/test/TestExprs2.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs2.py rename to lldb/test/API/commands/expression/test/TestExprs2.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/test/main.cpp b/lldb/test/API/commands/expression/test/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/test/main.cpp rename to lldb/test/API/commands/expression/test/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile b/lldb/test/API/commands/expression/timeout/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile rename to lldb/test/API/commands/expression/timeout/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/TestCallWithTimeout.py b/lldb/test/API/commands/expression/timeout/TestCallWithTimeout.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/timeout/TestCallWithTimeout.py rename to lldb/test/API/commands/expression/timeout/TestCallWithTimeout.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/wait-a-while.cpp b/lldb/test/API/commands/expression/timeout/wait-a-while.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/timeout/wait-a-while.cpp rename to lldb/test/API/commands/expression/timeout/wait-a-while.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile b/lldb/test/API/commands/expression/top-level/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile rename to lldb/test/API/commands/expression/top-level/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/TestTopLevelExprs.py b/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/top-level/TestTopLevelExprs.py rename to lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.cpp b/lldb/test/API/commands/expression/top-level/dummy.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.cpp rename to lldb/test/API/commands/expression/top-level/dummy.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/main.cpp b/lldb/test/API/commands/expression/top-level/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/top-level/main.cpp rename to lldb/test/API/commands/expression/top-level/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/test.cpp b/lldb/test/API/commands/expression/top-level/test.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/top-level/test.cpp rename to lldb/test/API/commands/expression/top-level/test.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile b/lldb/test/API/commands/expression/two-files/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile rename to lldb/test/API/commands/expression/two-files/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py rename to lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/foo.m b/lldb/test/API/commands/expression/two-files/foo.m rename from lldb/packages/Python/lldbsuite/test/commands/expression/two-files/foo.m rename to lldb/test/API/commands/expression/two-files/foo.m diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/main.m b/lldb/test/API/commands/expression/two-files/main.m rename from lldb/packages/Python/lldbsuite/test/commands/expression/two-files/main.m rename to lldb/test/API/commands/expression/two-files/main.m diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/TestUnicodeInVariable.py b/lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/TestUnicodeInVariable.py rename to lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/main.cpp b/lldb/test/API/commands/expression/unicode-in-variable/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/main.cpp rename to lldb/test/API/commands/expression/unicode-in-variable/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile b/lldb/test/API/commands/expression/unwind_expression/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile rename to lldb/test/API/commands/expression/unwind_expression/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/TestUnwindExpression.py b/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/TestUnwindExpression.py rename to lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/main.cpp b/lldb/test/API/commands/expression/unwind_expression/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/main.cpp rename to lldb/test/API/commands/expression/unwind_expression/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile b/lldb/test/API/commands/expression/vector_of_enums/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile rename to lldb/test/API/commands/expression/vector_of_enums/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/TestVectorOfEnums.py b/lldb/test/API/commands/expression/vector_of_enums/TestVectorOfEnums.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/TestVectorOfEnums.py rename to lldb/test/API/commands/expression/vector_of_enums/TestVectorOfEnums.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/main.cpp b/lldb/test/API/commands/expression/vector_of_enums/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/main.cpp rename to lldb/test/API/commands/expression/vector_of_enums/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile b/lldb/test/API/commands/expression/weak_symbols/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile rename to lldb/test/API/commands/expression/weak_symbols/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/TestWeakSymbols.py b/lldb/test/API/commands/expression/weak_symbols/TestWeakSymbols.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/TestWeakSymbols.py rename to lldb/test/API/commands/expression/weak_symbols/TestWeakSymbols.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/dylib.h b/lldb/test/API/commands/expression/weak_symbols/dylib.h rename from lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/dylib.h rename to lldb/test/API/commands/expression/weak_symbols/dylib.h diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/dylib.c b/lldb/test/API/commands/expression/weak_symbols/dylib.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/dylib.c rename to lldb/test/API/commands/expression/weak_symbols/dylib.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/main.c b/lldb/test/API/commands/expression/weak_symbols/main.c rename from lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/main.c rename to lldb/test/API/commands/expression/weak_symbols/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/module.modulemap b/lldb/test/API/commands/expression/weak_symbols/module.modulemap rename from lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/module.modulemap rename to lldb/test/API/commands/expression/weak_symbols/module.modulemap diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile b/lldb/test/API/commands/expression/xvalue/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile rename to lldb/test/API/commands/expression/xvalue/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/TestXValuePrinting.py b/lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py rename from lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/TestXValuePrinting.py rename to lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/main.cpp b/lldb/test/API/commands/expression/xvalue/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/main.cpp rename to lldb/test/API/commands/expression/xvalue/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile b/lldb/test/API/commands/frame/diagnose/array/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile rename to lldb/test/API/commands/frame/diagnose/array/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/TestArray.py b/lldb/test/API/commands/frame/diagnose/array/TestArray.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/TestArray.py rename to lldb/test/API/commands/frame/diagnose/array/TestArray.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/main.c b/lldb/test/API/commands/frame/diagnose/array/main.c rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/main.c rename to lldb/test/API/commands/frame/diagnose/array/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile b/lldb/test/API/commands/frame/diagnose/bad-reference/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile rename to lldb/test/API/commands/frame/diagnose/bad-reference/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/TestBadReference.py b/lldb/test/API/commands/frame/diagnose/bad-reference/TestBadReference.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/TestBadReference.py rename to lldb/test/API/commands/frame/diagnose/bad-reference/TestBadReference.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/main.cpp b/lldb/test/API/commands/frame/diagnose/bad-reference/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/main.cpp rename to lldb/test/API/commands/frame/diagnose/bad-reference/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile b/lldb/test/API/commands/frame/diagnose/complicated-expression/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile rename to lldb/test/API/commands/frame/diagnose/complicated-expression/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py b/lldb/test/API/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py rename to lldb/test/API/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/main.c b/lldb/test/API/commands/frame/diagnose/complicated-expression/main.c rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/main.c rename to lldb/test/API/commands/frame/diagnose/complicated-expression/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile b/lldb/test/API/commands/frame/diagnose/dereference-argument/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile rename to lldb/test/API/commands/frame/diagnose/dereference-argument/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py b/lldb/test/API/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py rename to lldb/test/API/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/main.c b/lldb/test/API/commands/frame/diagnose/dereference-argument/main.c rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/main.c rename to lldb/test/API/commands/frame/diagnose/dereference-argument/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile b/lldb/test/API/commands/frame/diagnose/dereference-function-return/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile rename to lldb/test/API/commands/frame/diagnose/dereference-function-return/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py b/lldb/test/API/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py rename to lldb/test/API/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/main.c b/lldb/test/API/commands/frame/diagnose/dereference-function-return/main.c rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/main.c rename to lldb/test/API/commands/frame/diagnose/dereference-function-return/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile b/lldb/test/API/commands/frame/diagnose/dereference-this/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile rename to lldb/test/API/commands/frame/diagnose/dereference-this/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py b/lldb/test/API/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py rename to lldb/test/API/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/main.cpp b/lldb/test/API/commands/frame/diagnose/dereference-this/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/main.cpp rename to lldb/test/API/commands/frame/diagnose/dereference-this/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile b/lldb/test/API/commands/frame/diagnose/inheritance/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile rename to lldb/test/API/commands/frame/diagnose/inheritance/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py b/lldb/test/API/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py rename to lldb/test/API/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/main.cpp b/lldb/test/API/commands/frame/diagnose/inheritance/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/main.cpp rename to lldb/test/API/commands/frame/diagnose/inheritance/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile b/lldb/test/API/commands/frame/diagnose/local-variable/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile rename to lldb/test/API/commands/frame/diagnose/local-variable/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/TestLocalVariable.py b/lldb/test/API/commands/frame/diagnose/local-variable/TestLocalVariable.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/TestLocalVariable.py rename to lldb/test/API/commands/frame/diagnose/local-variable/TestLocalVariable.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/main.c b/lldb/test/API/commands/frame/diagnose/local-variable/main.c rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/main.c rename to lldb/test/API/commands/frame/diagnose/local-variable/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile b/lldb/test/API/commands/frame/diagnose/virtual-method-call/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile rename to lldb/test/API/commands/frame/diagnose/virtual-method-call/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py b/lldb/test/API/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py rename to lldb/test/API/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/main.cpp b/lldb/test/API/commands/frame/diagnose/virtual-method-call/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/main.cpp rename to lldb/test/API/commands/frame/diagnose/virtual-method-call/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile b/lldb/test/API/commands/frame/language/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile rename to lldb/test/API/commands/frame/language/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py b/lldb/test/API/commands/frame/language/TestGuessLanguage.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py rename to lldb/test/API/commands/frame/language/TestGuessLanguage.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/main.cpp b/lldb/test/API/commands/frame/language/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/frame/language/main.cpp rename to lldb/test/API/commands/frame/language/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/other-2.cpp b/lldb/test/API/commands/frame/language/other-2.cpp rename from lldb/packages/Python/lldbsuite/test/commands/frame/language/other-2.cpp rename to lldb/test/API/commands/frame/language/other-2.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/other.h b/lldb/test/API/commands/frame/language/other.h rename from lldb/packages/Python/lldbsuite/test/commands/frame/language/other.h rename to lldb/test/API/commands/frame/language/other.h diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/other.cpp b/lldb/test/API/commands/frame/language/other.cpp rename from lldb/packages/Python/lldbsuite/test/commands/frame/language/other.cpp rename to lldb/test/API/commands/frame/language/other.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/somefunc.c b/lldb/test/API/commands/frame/language/somefunc.c rename from lldb/packages/Python/lldbsuite/test/commands/frame/language/somefunc.c rename to lldb/test/API/commands/frame/language/somefunc.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile b/lldb/test/API/commands/frame/recognizer/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile rename to lldb/test/API/commands/frame/recognizer/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/TestFrameRecognizer.py b/lldb/test/API/commands/frame/recognizer/TestFrameRecognizer.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/TestFrameRecognizer.py rename to lldb/test/API/commands/frame/recognizer/TestFrameRecognizer.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/main.m b/lldb/test/API/commands/frame/recognizer/main.m rename from lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/main.m rename to lldb/test/API/commands/frame/recognizer/main.m diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/recognizer.py b/lldb/test/API/commands/frame/recognizer/recognizer.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/recognizer.py rename to lldb/test/API/commands/frame/recognizer/recognizer.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/select/Makefile b/lldb/test/API/commands/frame/select/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/select/Makefile rename to lldb/test/API/commands/frame/select/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/select/TestFrameSelect.py b/lldb/test/API/commands/frame/select/TestFrameSelect.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/select/TestFrameSelect.py rename to lldb/test/API/commands/frame/select/TestFrameSelect.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/select/main.cpp b/lldb/test/API/commands/frame/select/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/frame/select/main.cpp rename to lldb/test/API/commands/frame/select/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/TestFrameVariableScope.py b/lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/TestFrameVariableScope.py rename to lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/main.c b/lldb/test/API/commands/frame/var-scope/main.c rename from lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/main.c rename to lldb/test/API/commands/frame/var-scope/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile b/lldb/test/API/commands/frame/var/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile rename to lldb/test/API/commands/frame/var/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var/TestFrameVar.py b/lldb/test/API/commands/frame/var/TestFrameVar.py rename from lldb/packages/Python/lldbsuite/test/commands/frame/var/TestFrameVar.py rename to lldb/test/API/commands/frame/var/TestFrameVar.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var/main.c b/lldb/test/API/commands/frame/var/main.c rename from lldb/packages/Python/lldbsuite/test/commands/frame/var/main.c rename to lldb/test/API/commands/frame/var/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basic/Makefile b/lldb/test/API/commands/gui/basic/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/gui/basic/Makefile rename to lldb/test/API/commands/gui/basic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basic/TestGuiBasic.py b/lldb/test/API/commands/gui/basic/TestGuiBasic.py rename from lldb/packages/Python/lldbsuite/test/commands/gui/basic/TestGuiBasic.py rename to lldb/test/API/commands/gui/basic/TestGuiBasic.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basic/main.c b/lldb/test/API/commands/gui/basic/main.c rename from lldb/packages/Python/lldbsuite/test/commands/gui/basic/main.c rename to lldb/test/API/commands/gui/basic/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/invalid-args/TestInvalidArgsGui.py b/lldb/test/API/commands/gui/invalid-args/TestInvalidArgsGui.py rename from lldb/packages/Python/lldbsuite/test/commands/gui/invalid-args/TestInvalidArgsGui.py rename to lldb/test/API/commands/gui/invalid-args/TestInvalidArgsGui.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/help/TestHelp.py b/lldb/test/API/commands/help/TestHelp.py rename from lldb/packages/Python/lldbsuite/test/commands/help/TestHelp.py rename to lldb/test/API/commands/help/TestHelp.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile b/lldb/test/API/commands/log/basic/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile rename to lldb/test/API/commands/log/basic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/log/basic/TestLogging.py b/lldb/test/API/commands/log/basic/TestLogging.py rename from lldb/packages/Python/lldbsuite/test/commands/log/basic/TestLogging.py rename to lldb/test/API/commands/log/basic/TestLogging.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/log/basic/main.cpp b/lldb/test/API/commands/log/basic/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/log/basic/main.cpp rename to lldb/test/API/commands/log/basic/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/log/invalid-args/TestInvalidArgsLog.py b/lldb/test/API/commands/log/invalid-args/TestInvalidArgsLog.py rename from lldb/packages/Python/lldbsuite/test/commands/log/invalid-args/TestInvalidArgsLog.py rename to lldb/test/API/commands/log/invalid-args/TestInvalidArgsLog.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformCommand.py b/lldb/test/API/commands/platform/basic/TestPlatformCommand.py rename from lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformCommand.py rename to lldb/test/API/commands/platform/basic/TestPlatformCommand.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformPython.py b/lldb/test/API/commands/platform/basic/TestPlatformPython.py rename from lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformPython.py rename to lldb/test/API/commands/platform/basic/TestPlatformPython.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/platform/process/Makefile b/lldb/test/API/commands/platform/process/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/platform/process/Makefile rename to lldb/test/API/commands/platform/process/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/platform/process/TestProcessList.py b/lldb/test/API/commands/platform/process/TestProcessList.py rename from lldb/packages/Python/lldbsuite/test/commands/platform/process/TestProcessList.py rename to lldb/test/API/commands/platform/process/TestProcessList.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/platform/process/main.cpp b/lldb/test/API/commands/platform/process/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/platform/process/main.cpp rename to lldb/test/API/commands/platform/process/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile b/lldb/test/API/commands/process/attach-resume/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile rename to lldb/test/API/commands/process/attach-resume/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py b/lldb/test/API/commands/process/attach-resume/TestAttachResume.py rename from lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py rename to lldb/test/API/commands/process/attach-resume/TestAttachResume.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/main.cpp b/lldb/test/API/commands/process/attach-resume/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/main.cpp rename to lldb/test/API/commands/process/attach-resume/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile b/lldb/test/API/commands/process/attach/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile rename to lldb/test/API/commands/process/attach/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/TestProcessAttach.py b/lldb/test/API/commands/process/attach/TestProcessAttach.py rename from lldb/packages/Python/lldbsuite/test/commands/process/attach/TestProcessAttach.py rename to lldb/test/API/commands/process/attach/TestProcessAttach.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile b/lldb/test/API/commands/process/attach/attach_denied/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile rename to lldb/test/API/commands/process/attach/attach_denied/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/TestAttachDenied.py b/lldb/test/API/commands/process/attach/attach_denied/TestAttachDenied.py rename from lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/TestAttachDenied.py rename to lldb/test/API/commands/process/attach/attach_denied/TestAttachDenied.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/entitlements.plist b/lldb/test/API/commands/process/attach/attach_denied/entitlements.plist rename from lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/entitlements.plist rename to lldb/test/API/commands/process/attach/attach_denied/entitlements.plist diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/main.cpp b/lldb/test/API/commands/process/attach/attach_denied/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/main.cpp rename to lldb/test/API/commands/process/attach/attach_denied/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/main.cpp b/lldb/test/API/commands/process/attach/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/process/attach/main.cpp rename to lldb/test/API/commands/process/attach/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile b/lldb/test/API/commands/process/launch-with-shellexpand/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile rename to lldb/test/API/commands/process/launch-with-shellexpand/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py b/lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py rename from lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py rename to lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file1.txt b/lldb/test/API/commands/process/launch-with-shellexpand/file1.txt rename from lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file1.txt rename to lldb/test/API/commands/process/launch-with-shellexpand/file1.txt diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file2.txt b/lldb/test/API/commands/process/launch-with-shellexpand/file2.txt rename from lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file2.txt rename to lldb/test/API/commands/process/launch-with-shellexpand/file2.txt diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file3.txt b/lldb/test/API/commands/process/launch-with-shellexpand/file3.txt rename from lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file3.txt rename to lldb/test/API/commands/process/launch-with-shellexpand/file3.txt diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file4.txy b/lldb/test/API/commands/process/launch-with-shellexpand/file4.txy rename from lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file4.txy rename to lldb/test/API/commands/process/launch-with-shellexpand/file4.txy diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file5.tyx b/lldb/test/API/commands/process/launch-with-shellexpand/file5.tyx rename from lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file5.tyx rename to lldb/test/API/commands/process/launch-with-shellexpand/file5.tyx diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/foo bar b/lldb/test/API/commands/process/launch-with-shellexpand/foo bar rename from lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/foo bar rename to lldb/test/API/commands/process/launch-with-shellexpand/foo bar diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/main.cpp b/lldb/test/API/commands/process/launch-with-shellexpand/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/main.cpp rename to lldb/test/API/commands/process/launch-with-shellexpand/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile b/lldb/test/API/commands/process/launch/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile rename to lldb/test/API/commands/process/launch/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch/TestProcessLaunch.py b/lldb/test/API/commands/process/launch/TestProcessLaunch.py rename from lldb/packages/Python/lldbsuite/test/commands/process/launch/TestProcessLaunch.py rename to lldb/test/API/commands/process/launch/TestProcessLaunch.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch/input-file.txt b/lldb/test/API/commands/process/launch/input-file.txt rename from lldb/packages/Python/lldbsuite/test/commands/process/launch/input-file.txt rename to lldb/test/API/commands/process/launch/input-file.txt diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch/main.cpp b/lldb/test/API/commands/process/launch/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/process/launch/main.cpp rename to lldb/test/API/commands/process/launch/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch/print_cwd.cpp b/lldb/test/API/commands/process/launch/print_cwd.cpp rename from lldb/packages/Python/lldbsuite/test/commands/process/launch/print_cwd.cpp rename to lldb/test/API/commands/process/launch/print_cwd.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch/print_env.cpp b/lldb/test/API/commands/process/launch/print_env.cpp rename from lldb/packages/Python/lldbsuite/test/commands/process/launch/print_env.cpp rename to lldb/test/API/commands/process/launch/print_env.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/quit/TestQuit.py b/lldb/test/API/commands/quit/TestQuit.py rename from lldb/packages/Python/lldbsuite/test/commands/quit/TestQuit.py rename to lldb/test/API/commands/quit/TestQuit.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile b/lldb/test/API/commands/register/register/intel_xtended_registers/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile rename to lldb/test/API/commands/register/register/intel_xtended_registers/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/TestMPXRegisters.py b/lldb/test/API/commands/register/register/intel_xtended_registers/TestMPXRegisters.py rename from lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/TestMPXRegisters.py rename to lldb/test/API/commands/register/register/intel_xtended_registers/TestMPXRegisters.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/main.cpp b/lldb/test/API/commands/register/register/intel_xtended_registers/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/main.cpp rename to lldb/test/API/commands/register/register/intel_xtended_registers/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile b/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile rename to lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py b/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py rename from lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py rename to lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp b/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp rename to lldb/test/API/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/Makefile b/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_offset_intersection/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/Makefile rename to lldb/test/API/commands/register/register/intel_xtended_registers/mpx_offset_intersection/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/TestMPXOffsetIntersection.py b/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_offset_intersection/TestMPXOffsetIntersection.py rename from lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/TestMPXOffsetIntersection.py rename to lldb/test/API/commands/register/register/intel_xtended_registers/mpx_offset_intersection/TestMPXOffsetIntersection.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/main.cpp b/lldb/test/API/commands/register/register/intel_xtended_registers/mpx_offset_intersection/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/main.cpp rename to lldb/test/API/commands/register/register/intel_xtended_registers/mpx_offset_intersection/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile b/lldb/test/API/commands/register/register/register_command/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile rename to lldb/test/API/commands/register/register/register_command/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/TestRegisters.py b/lldb/test/API/commands/register/register/register_command/TestRegisters.py rename from lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/TestRegisters.py rename to lldb/test/API/commands/register/register/register_command/TestRegisters.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/a.cpp b/lldb/test/API/commands/register/register/register_command/a.cpp rename from lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/a.cpp rename to lldb/test/API/commands/register/register/register_command/a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/main.cpp b/lldb/test/API/commands/register/register/register_command/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/main.cpp rename to lldb/test/API/commands/register/register/register_command/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py b/lldb/test/API/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py rename from lldb/packages/Python/lldbsuite/test/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py rename to lldb/test/API/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile b/lldb/test/API/commands/settings/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/settings/Makefile rename to lldb/test/API/commands/settings/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/TestSettings.py b/lldb/test/API/commands/settings/TestSettings.py rename from lldb/packages/Python/lldbsuite/test/commands/settings/TestSettings.py rename to lldb/test/API/commands/settings/TestSettings.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/main.cpp b/lldb/test/API/commands/settings/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/settings/main.cpp rename to lldb/test/API/commands/settings/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile b/lldb/test/API/commands/settings/quoting/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile rename to lldb/test/API/commands/settings/quoting/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/TestQuoting.py b/lldb/test/API/commands/settings/quoting/TestQuoting.py rename from lldb/packages/Python/lldbsuite/test/commands/settings/quoting/TestQuoting.py rename to lldb/test/API/commands/settings/quoting/TestQuoting.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/main.c b/lldb/test/API/commands/settings/quoting/main.c rename from lldb/packages/Python/lldbsuite/test/commands/settings/quoting/main.c rename to lldb/test/API/commands/settings/quoting/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/source/info/TestSourceInfo.py b/lldb/test/API/commands/source/info/TestSourceInfo.py rename from lldb/packages/Python/lldbsuite/test/commands/source/info/TestSourceInfo.py rename to lldb/test/API/commands/source/info/TestSourceInfo.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/source/info/main.cpp b/lldb/test/API/commands/source/info/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/source/info/main.cpp rename to lldb/test/API/commands/source/info/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/source/info/second.cpp b/lldb/test/API/commands/source/info/second.cpp rename from lldb/packages/Python/lldbsuite/test/commands/source/info/second.cpp rename to lldb/test/API/commands/source/info/second.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/TestStats.py b/lldb/test/API/commands/statistics/basic/TestStats.py rename from lldb/packages/Python/lldbsuite/test/commands/statistics/basic/TestStats.py rename to lldb/test/API/commands/statistics/basic/TestStats.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/main.c b/lldb/test/API/commands/statistics/basic/main.c rename from lldb/packages/Python/lldbsuite/test/commands/statistics/basic/main.c rename to lldb/test/API/commands/statistics/basic/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/auto-install-main-executable/Makefile b/lldb/test/API/commands/target/auto-install-main-executable/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/target/auto-install-main-executable/Makefile rename to lldb/test/API/commands/target/auto-install-main-executable/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py b/lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py rename from lldb/packages/Python/lldbsuite/test/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py rename to lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/auto-install-main-executable/main.cpp b/lldb/test/API/commands/target/auto-install-main-executable/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/target/auto-install-main-executable/main.cpp rename to lldb/test/API/commands/target/auto-install-main-executable/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile b/lldb/test/API/commands/target/basic/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile rename to lldb/test/API/commands/target/basic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/TestTargetCommand.py b/lldb/test/API/commands/target/basic/TestTargetCommand.py rename from lldb/packages/Python/lldbsuite/test/commands/target/basic/TestTargetCommand.py rename to lldb/test/API/commands/target/basic/TestTargetCommand.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/a.c b/lldb/test/API/commands/target/basic/a.c rename from lldb/packages/Python/lldbsuite/test/commands/target/basic/a.c rename to lldb/test/API/commands/target/basic/a.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/b.c b/lldb/test/API/commands/target/basic/b.c rename from lldb/packages/Python/lldbsuite/test/commands/target/basic/b.c rename to lldb/test/API/commands/target/basic/b.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/c.c b/lldb/test/API/commands/target/basic/c.c rename from lldb/packages/Python/lldbsuite/test/commands/target/basic/c.c rename to lldb/test/API/commands/target/basic/c.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/globals.c b/lldb/test/API/commands/target/basic/globals.c rename from lldb/packages/Python/lldbsuite/test/commands/target/basic/globals.c rename to lldb/test/API/commands/target/basic/globals.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/invalid_core_file b/lldb/test/API/commands/target/basic/invalid_core_file rename from lldb/packages/Python/lldbsuite/test/commands/target/basic/invalid_core_file rename to lldb/test/API/commands/target/basic/invalid_core_file diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile b/lldb/test/API/commands/target/create-deps/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile rename to lldb/test/API/commands/target/create-deps/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/TestTargetCreateDeps.py b/lldb/test/API/commands/target/create-deps/TestTargetCreateDeps.py rename from lldb/packages/Python/lldbsuite/test/commands/target/create-deps/TestTargetCreateDeps.py rename to lldb/test/API/commands/target/create-deps/TestTargetCreateDeps.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.cpp b/lldb/test/API/commands/target/create-deps/a.cpp rename from lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.cpp rename to lldb/test/API/commands/target/create-deps/a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/main.cpp b/lldb/test/API/commands/target/create-deps/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/target/create-deps/main.cpp rename to lldb/test/API/commands/target/create-deps/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile b/lldb/test/API/commands/target/create-no-such-arch/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile rename to lldb/test/API/commands/target/create-no-such-arch/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py b/lldb/test/API/commands/target/create-no-such-arch/TestNoSuchArch.py rename from lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py rename to lldb/test/API/commands/target/create-no-such-arch/TestNoSuchArch.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/main.cpp b/lldb/test/API/commands/target/create-no-such-arch/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/main.cpp rename to lldb/test/API/commands/target/create-no-such-arch/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/dump-symtab-demangle/TestDumpSymtabDemangle.py b/lldb/test/API/commands/target/dump-symtab-demangle/TestDumpSymtabDemangle.py rename from lldb/packages/Python/lldbsuite/test/commands/target/dump-symtab-demangle/TestDumpSymtabDemangle.py rename to lldb/test/API/commands/target/dump-symtab-demangle/TestDumpSymtabDemangle.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/dump-symtab-demangle/a.yaml b/lldb/test/API/commands/target/dump-symtab-demangle/a.yaml rename from lldb/packages/Python/lldbsuite/test/commands/target/dump-symtab-demangle/a.yaml rename to lldb/test/API/commands/target/dump-symtab-demangle/a.yaml diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile b/lldb/test/API/commands/target/stop-hooks/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile rename to lldb/test/API/commands/target/stop-hooks/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/TestStopHooks.py b/lldb/test/API/commands/target/stop-hooks/TestStopHooks.py rename from lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/TestStopHooks.py rename to lldb/test/API/commands/target/stop-hooks/TestStopHooks.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/main.c b/lldb/test/API/commands/target/stop-hooks/main.c rename from lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/main.c rename to lldb/test/API/commands/target/stop-hooks/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/version/TestVersion.py b/lldb/test/API/commands/version/TestVersion.py rename from lldb/packages/Python/lldbsuite/test/commands/version/TestVersion.py rename to lldb/test/API/commands/version/TestVersion.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/.categories b/lldb/test/API/commands/watchpoints/.categories rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/.categories rename to lldb/test/API/commands/watchpoints/.categories diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile b/lldb/test/API/commands/watchpoints/hello_watchlocation/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile rename to lldb/test/API/commands/watchpoints/hello_watchlocation/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py b/lldb/test/API/commands/watchpoints/hello_watchlocation/TestWatchLocation.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py rename to lldb/test/API/commands/watchpoints/hello_watchlocation/TestWatchLocation.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/main.cpp b/lldb/test/API/commands/watchpoints/hello_watchlocation/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/main.cpp rename to lldb/test/API/commands/watchpoints/hello_watchlocation/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile b/lldb/test/API/commands/watchpoints/hello_watchpoint/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile rename to lldb/test/API/commands/watchpoints/hello_watchpoint/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/test/API/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py rename to lldb/test/API/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/main.c b/lldb/test/API/commands/watchpoints/hello_watchpoint/main.c rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/main.c rename to lldb/test/API/commands/watchpoints/hello_watchpoint/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile b/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile rename to lldb/test/API/commands/watchpoints/multi_watchpoint_slots/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py b/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py rename to lldb/test/API/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/main.c b/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/main.c rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/main.c rename to lldb/test/API/commands/watchpoints/multi_watchpoint_slots/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile b/lldb/test/API/commands/watchpoints/multiple_hits/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile rename to lldb/test/API/commands/watchpoints/multiple_hits/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/TestMultipleHits.py b/lldb/test/API/commands/watchpoints/multiple_hits/TestMultipleHits.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/TestMultipleHits.py rename to lldb/test/API/commands/watchpoints/multiple_hits/TestMultipleHits.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/main.cpp b/lldb/test/API/commands/watchpoints/multiple_hits/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/main.cpp rename to lldb/test/API/commands/watchpoints/multiple_hits/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile b/lldb/test/API/commands/watchpoints/multiple_threads/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile rename to lldb/test/API/commands/watchpoints/multiple_threads/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py rename to lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/main.cpp b/lldb/test/API/commands/watchpoints/multiple_threads/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/main.cpp rename to lldb/test/API/commands/watchpoints/multiple_threads/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile b/lldb/test/API/commands/watchpoints/step_over_watchpoint/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile rename to lldb/test/API/commands/watchpoints/step_over_watchpoint/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py b/lldb/test/API/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py rename to lldb/test/API/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/main.c b/lldb/test/API/commands/watchpoints/step_over_watchpoint/main.c rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/main.c rename to lldb/test/API/commands/watchpoints/step_over_watchpoint/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile b/lldb/test/API/commands/watchpoints/variable_out_of_scope/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile rename to lldb/test/API/commands/watchpoints/variable_out_of_scope/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/test/API/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py rename to lldb/test/API/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/main.c b/lldb/test/API/commands/watchpoints/variable_out_of_scope/main.c rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/main.c rename to lldb/test/API/commands/watchpoints/variable_out_of_scope/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile b/lldb/test/API/commands/watchpoints/watchpoint_commands/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile rename to lldb/test/API/commands/watchpoints/watchpoint_commands/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py b/lldb/test/API/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py rename to lldb/test/API/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile rename to lldb/test/API/commands/watchpoints/watchpoint_commands/command/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py rename to lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py rename to lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/main.cpp b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/main.cpp rename to lldb/test/API/commands/watchpoints/watchpoint_commands/command/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/watchpoint_command.py b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/watchpoint_command.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/watchpoint_command.py rename to lldb/test/API/commands/watchpoints/watchpoint_commands/command/watchpoint_command.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile b/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile rename to lldb/test/API/commands/watchpoints/watchpoint_commands/condition/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py rename to lldb/test/API/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/main.cpp b/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/main.cpp rename to lldb/test/API/commands/watchpoints/watchpoint_commands/condition/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/main.c b/lldb/test/API/commands/watchpoints/watchpoint_commands/main.c rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/main.c rename to lldb/test/API/commands/watchpoints/watchpoint_commands/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile b/lldb/test/API/commands/watchpoints/watchpoint_disable/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile rename to lldb/test/API/commands/watchpoints/watchpoint_disable/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py b/lldb/test/API/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py rename to lldb/test/API/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/main.c b/lldb/test/API/commands/watchpoints/watchpoint_disable/main.c rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/main.c rename to lldb/test/API/commands/watchpoints/watchpoint_disable/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile b/lldb/test/API/commands/watchpoints/watchpoint_events/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile rename to lldb/test/API/commands/watchpoints/watchpoint_events/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py b/lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py rename to lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/main.c b/lldb/test/API/commands/watchpoints/watchpoint_events/main.c rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/main.c rename to lldb/test/API/commands/watchpoints/watchpoint_events/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile b/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile rename to lldb/test/API/commands/watchpoints/watchpoint_on_vectors/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py b/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py rename to lldb/test/API/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/main.c b/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/main.c rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/main.c rename to lldb/test/API/commands/watchpoints/watchpoint_on_vectors/main.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile b/lldb/test/API/commands/watchpoints/watchpoint_set_command/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile rename to lldb/test/API/commands/watchpoints/watchpoint_set_command/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/test/API/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py rename to lldb/test/API/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/main.cpp b/lldb/test/API/commands/watchpoints/watchpoint_set_command/main.cpp rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/main.cpp rename to lldb/test/API/commands/watchpoints/watchpoint_set_command/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile b/lldb/test/API/commands/watchpoints/watchpoint_size/Makefile rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile rename to lldb/test/API/commands/watchpoints/watchpoint_size/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py b/lldb/test/API/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py rename to lldb/test/API/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/main.c b/lldb/test/API/commands/watchpoints/watchpoint_size/main.c rename from lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/main.c rename to lldb/test/API/commands/watchpoints/watchpoint_size/main.c diff --git a/lldb/packages/Python/lldbsuite/test/driver/batch_mode/Makefile b/lldb/test/API/driver/batch_mode/Makefile rename from lldb/packages/Python/lldbsuite/test/driver/batch_mode/Makefile rename to lldb/test/API/driver/batch_mode/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py b/lldb/test/API/driver/batch_mode/TestBatchMode.py rename from lldb/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py rename to lldb/test/API/driver/batch_mode/TestBatchMode.py diff --git a/lldb/packages/Python/lldbsuite/test/driver/batch_mode/main.c b/lldb/test/API/driver/batch_mode/main.c rename from lldb/packages/Python/lldbsuite/test/driver/batch_mode/main.c rename to lldb/test/API/driver/batch_mode/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/.categories b/lldb/test/API/functionalities/abbreviation/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/.categories rename to lldb/test/API/functionalities/abbreviation/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/API/functionalities/abbreviation/TestAbbreviations.py rename from lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py rename to lldb/test/API/functionalities/abbreviation/TestAbbreviations.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py rename from lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py rename to lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/alias/.categories b/lldb/test/API/functionalities/alias/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/alias/.categories rename to lldb/test/API/functionalities/alias/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile b/lldb/test/API/functionalities/archives/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile rename to lldb/test/API/functionalities/archives/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/README b/lldb/test/API/functionalities/archives/README rename from lldb/packages/Python/lldbsuite/test/functionalities/archives/README rename to lldb/test/API/functionalities/archives/README diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py b/lldb/test/API/functionalities/archives/TestBSDArchives.py rename from lldb/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py rename to lldb/test/API/functionalities/archives/TestBSDArchives.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/a.c b/lldb/test/API/functionalities/archives/a.c rename from lldb/packages/Python/lldbsuite/test/functionalities/archives/a.c rename to lldb/test/API/functionalities/archives/a.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/b.c b/lldb/test/API/functionalities/archives/b.c rename from lldb/packages/Python/lldbsuite/test/functionalities/archives/b.c rename to lldb/test/API/functionalities/archives/b.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/main.c b/lldb/test/API/functionalities/archives/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/archives/main.c rename to lldb/test/API/functionalities/archives/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile b/lldb/test/API/functionalities/asan/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile rename to lldb/test/API/functionalities/asan/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py b/lldb/test/API/functionalities/asan/TestMemoryHistory.py rename from lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py rename to lldb/test/API/functionalities/asan/TestMemoryHistory.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py b/lldb/test/API/functionalities/asan/TestReportData.py rename from lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py rename to lldb/test/API/functionalities/asan/TestReportData.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/main.c b/lldb/test/API/functionalities/asan/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/asan/main.c rename to lldb/test/API/functionalities/asan/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile b/lldb/test/API/functionalities/avoids-fd-leak/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile rename to lldb/test/API/functionalities/avoids-fd-leak/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py b/lldb/test/API/functionalities/avoids-fd-leak/TestFdLeak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py rename to lldb/test/API/functionalities/avoids-fd-leak/TestFdLeak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/main.c b/lldb/test/API/functionalities/avoids-fd-leak/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/main.c rename to lldb/test/API/functionalities/avoids-fd-leak/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/backticks/.categories b/lldb/test/API/functionalities/backticks/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/backticks/.categories rename to lldb/test/API/functionalities/backticks/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py b/lldb/test/API/functionalities/backticks/TestBackticksWithoutATarget.py rename from lldb/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py rename to lldb/test/API/functionalities/backticks/TestBackticksWithoutATarget.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/Makefile b/lldb/test/API/functionalities/breakpoint/address_breakpoints/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/Makefile rename to lldb/test/API/functionalities/breakpoint/address_breakpoints/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py b/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py rename to lldb/test/API/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py b/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py rename to lldb/test/API/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/main.c b/lldb/test/API/functionalities/breakpoint/address_breakpoints/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/main.c rename to lldb/test/API/functionalities/breakpoint/address_breakpoints/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/Makefile b/lldb/test/API/functionalities/breakpoint/auto_continue/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/Makefile rename to lldb/test/API/functionalities/breakpoint/auto_continue/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py b/lldb/test/API/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py rename to lldb/test/API/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/main.c b/lldb/test/API/functionalities/breakpoint/auto_continue/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/main.c rename to lldb/test/API/functionalities/breakpoint/auto_continue/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/main.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_callback_command_source/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_callback_command_source/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py b/lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_callback_command_source/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_callback_command_source/main.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_callback_command_source/source.lldb b/lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/source.lldb rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_callback_command_source/source.lldb rename to lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/source.lldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_command/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_command/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/a.c b/lldb/test/API/functionalities/breakpoint/breakpoint_command/a.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/a.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_command/a.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/b.c b/lldb/test/API/functionalities/breakpoint/breakpoint_command/b.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/b.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_command/b.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/bktptcmd.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_command/bktptcmd.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_command/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/main.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_command/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/side_effect.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/side_effect.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/side_effect.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_command/side_effect.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_conditions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/main.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_conditions/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py b/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/main.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/main.cpp rename to lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_ids/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/main.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/main.cpp rename to lldb/test/API/functionalities/breakpoint/breakpoint_ids/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/main.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py b/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/main.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_language/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_language/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py b/lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/a.c b/lldb/test/API/functionalities/breakpoint/breakpoint_language/a.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/a.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_language/a.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/b.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_language/b.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/b.cpp rename to lldb/test/API/functionalities/breakpoint/breakpoint_language/b.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/main.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_language/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/main.cpp rename to lldb/test/API/functionalities/breakpoint/breakpoint_language/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_locations/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/main.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_locations/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_names/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_names/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py b/lldb/test/API/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/main.c b/lldb/test/API/functionalities/breakpoint/breakpoint_names/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/main.c rename to lldb/test/API/functionalities/breakpoint/breakpoint_names/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_options/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_options/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py b/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/foo.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_options/foo.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/foo.cpp rename to lldb/test/API/functionalities/breakpoint/breakpoint_options/foo.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/main.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_options/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/main.cpp rename to lldb/test/API/functionalities/breakpoint/breakpoint_options/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/Makefile b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/Makefile rename to lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py rename to lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/main.cpp b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/main.cpp rename to lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile b/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile rename to lldb/test/API/functionalities/breakpoint/comp_dir_symlink/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py b/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py rename to lldb/test/API/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/main.cpp b/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/main.cpp rename to lldb/test/API/functionalities/breakpoint/comp_dir_symlink/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/Makefile b/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/Makefile rename to lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py b/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py rename to lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/main.cpp b/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/main.cpp rename to lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile b/lldb/test/API/functionalities/breakpoint/cpp/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile rename to lldb/test/API/functionalities/breakpoint/cpp/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py b/lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py rename to lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp b/lldb/test/API/functionalities/breakpoint/cpp/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp rename to lldb/test/API/functionalities/breakpoint/cpp/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/Makefile b/lldb/test/API/functionalities/breakpoint/cpp_exception/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/Makefile rename to lldb/test/API/functionalities/breakpoint/cpp_exception/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py b/lldb/test/API/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py rename to lldb/test/API/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/main.cpp b/lldb/test/API/functionalities/breakpoint/cpp_exception/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/main.cpp rename to lldb/test/API/functionalities/breakpoint/cpp_exception/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/Makefile b/lldb/test/API/functionalities/breakpoint/debugbreak/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/Makefile rename to lldb/test/API/functionalities/breakpoint/debugbreak/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/TestDebugBreak.py b/lldb/test/API/functionalities/breakpoint/debugbreak/TestDebugBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/TestDebugBreak.py rename to lldb/test/API/functionalities/breakpoint/debugbreak/TestDebugBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/main.c b/lldb/test/API/functionalities/breakpoint/debugbreak/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/main.c rename to lldb/test/API/functionalities/breakpoint/debugbreak/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile rename to lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py rename to lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/main.c b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/main.c rename to lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/Makefile b/lldb/test/API/functionalities/breakpoint/global_constructor/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/Makefile rename to lldb/test/API/functionalities/breakpoint/global_constructor/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py b/lldb/test/API/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py rename to lldb/test/API/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.h b/lldb/test/API/functionalities/breakpoint/global_constructor/foo.h rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.h rename to lldb/test/API/functionalities/breakpoint/global_constructor/foo.h diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.cpp b/lldb/test/API/functionalities/breakpoint/global_constructor/foo.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.cpp rename to lldb/test/API/functionalities/breakpoint/global_constructor/foo.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/main.cpp b/lldb/test/API/functionalities/breakpoint/global_constructor/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/main.cpp rename to lldb/test/API/functionalities/breakpoint/global_constructor/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/Makefile b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/Makefile rename to lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py rename to lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp rename to lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/Makefile b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/Makefile rename to lldb/test/API/functionalities/breakpoint/inlined_breakpoints/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py rename to lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp rename to lldb/test/API/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/int.cpp b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/int.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/int.cpp rename to lldb/test/API/functionalities/breakpoint/inlined_breakpoints/int.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/Makefile b/lldb/test/API/functionalities/breakpoint/move_nearest/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/Makefile rename to lldb/test/API/functionalities/breakpoint/move_nearest/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/TestMoveNearest.py b/lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/TestMoveNearest.py rename to lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.h b/lldb/test/API/functionalities/breakpoint/move_nearest/foo.h rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.h rename to lldb/test/API/functionalities/breakpoint/move_nearest/foo.h diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.cpp b/lldb/test/API/functionalities/breakpoint/move_nearest/foo.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.cpp rename to lldb/test/API/functionalities/breakpoint/move_nearest/foo.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/main.cpp b/lldb/test/API/functionalities/breakpoint/move_nearest/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/main.cpp rename to lldb/test/API/functionalities/breakpoint/move_nearest/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile b/lldb/test/API/functionalities/breakpoint/objc/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile rename to lldb/test/API/functionalities/breakpoint/objc/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/test/API/functionalities/breakpoint/objc/TestObjCBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py rename to lldb/test/API/functionalities/breakpoint/objc/TestObjCBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/main.m b/lldb/test/API/functionalities/breakpoint/objc/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/main.m rename to lldb/test/API/functionalities/breakpoint/objc/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/Makefile b/lldb/test/API/functionalities/breakpoint/require_hw_breakpoints/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/Makefile rename to lldb/test/API/functionalities/breakpoint/require_hw_breakpoints/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/TestRequireHWBreakpoints.py b/lldb/test/API/functionalities/breakpoint/require_hw_breakpoints/TestRequireHWBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/TestRequireHWBreakpoints.py rename to lldb/test/API/functionalities/breakpoint/require_hw_breakpoints/TestRequireHWBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/main.c b/lldb/test/API/functionalities/breakpoint/require_hw_breakpoints/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/main.c rename to lldb/test/API/functionalities/breakpoint/require_hw_breakpoints/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/Makefile b/lldb/test/API/functionalities/breakpoint/scripted_bkpt/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/Makefile rename to lldb/test/API/functionalities/breakpoint/scripted_bkpt/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py b/lldb/test/API/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py rename to lldb/test/API/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/main.c b/lldb/test/API/functionalities/breakpoint/scripted_bkpt/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/main.c rename to lldb/test/API/functionalities/breakpoint/scripted_bkpt/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/resolver.py b/lldb/test/API/functionalities/breakpoint/scripted_bkpt/resolver.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/resolver.py rename to lldb/test/API/functionalities/breakpoint/scripted_bkpt/resolver.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/Makefile b/lldb/test/API/functionalities/breakpoint/serialize/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/Makefile rename to lldb/test/API/functionalities/breakpoint/serialize/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py b/lldb/test/API/functionalities/breakpoint/serialize/TestBreakpointSerialization.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py rename to lldb/test/API/functionalities/breakpoint/serialize/TestBreakpointSerialization.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/main.c b/lldb/test/API/functionalities/breakpoint/serialize/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/main.c rename to lldb/test/API/functionalities/breakpoint/serialize/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/resolver.py b/lldb/test/API/functionalities/breakpoint/serialize/resolver.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/resolver.py rename to lldb/test/API/functionalities/breakpoint/serialize/resolver.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/side_effect.py b/lldb/test/API/functionalities/breakpoint/serialize/side_effect.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/side_effect.py rename to lldb/test/API/functionalities/breakpoint/serialize/side_effect.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/Makefile b/lldb/test/API/functionalities/breakpoint/source_regexp/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/Makefile rename to lldb/test/API/functionalities/breakpoint/source_regexp/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py b/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py rename to lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.h b/lldb/test/API/functionalities/breakpoint/source_regexp/a.h rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.h rename to lldb/test/API/functionalities/breakpoint/source_regexp/a.h diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.c b/lldb/test/API/functionalities/breakpoint/source_regexp/a.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.c rename to lldb/test/API/functionalities/breakpoint/source_regexp/a.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/main.c b/lldb/test/API/functionalities/breakpoint/source_regexp/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/main.c rename to lldb/test/API/functionalities/breakpoint/source_regexp/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/Makefile b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/Makefile rename to lldb/test/API/functionalities/breakpoint/step_over_breakpoint/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py rename to lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/main.cpp b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/main.cpp rename to lldb/test/API/functionalities/breakpoint/step_over_breakpoint/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/completion/.categories b/lldb/test/API/functionalities/completion/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/completion/.categories rename to lldb/test/API/functionalities/completion/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile b/lldb/test/API/functionalities/completion/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile rename to lldb/test/API/functionalities/completion/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py b/lldb/test/API/functionalities/completion/TestCompletion.py rename from lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py rename to lldb/test/API/functionalities/completion/TestCompletion.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/completion/main.cpp b/lldb/test/API/functionalities/completion/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/completion/main.cpp rename to lldb/test/API/functionalities/completion/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/.lldb b/lldb/test/API/functionalities/conditional_break/.lldb rename from lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/.lldb rename to lldb/test/API/functionalities/conditional_break/.lldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile b/lldb/test/API/functionalities/conditional_break/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile rename to lldb/test/API/functionalities/conditional_break/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py b/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py rename to lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/conditional_break.py b/lldb/test/API/functionalities/conditional_break/conditional_break.py rename from lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/conditional_break.py rename to lldb/test/API/functionalities/conditional_break/conditional_break.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/main.c b/lldb/test/API/functionalities/conditional_break/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/main.c rename to lldb/test/API/functionalities/conditional_break/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/.categories b/lldb/test/API/functionalities/darwin_log/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/.categories rename to lldb/test/API/functionalities/darwin_log/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile b/lldb/test/API/functionalities/darwin_log/basic/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile rename to lldb/test/API/functionalities/darwin_log/basic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/TestDarwinLogBasic.py b/lldb/test/API/functionalities/darwin_log/basic/TestDarwinLogBasic.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/TestDarwinLogBasic.py rename to lldb/test/API/functionalities/darwin_log/basic/TestDarwinLogBasic.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/main.c b/lldb/test/API/functionalities/darwin_log/basic/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/main.c rename to lldb/test/API/functionalities/darwin_log/basic/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/common/darwin_log_common.h b/lldb/test/API/functionalities/darwin_log/common/darwin_log_common.h rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/common/darwin_log_common.h rename to lldb/test/API/functionalities/darwin_log/common/darwin_log_common.h diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/TestDarwinLogFilterMatchActivityChain.py b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/TestDarwinLogFilterMatchActivityChain.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/TestDarwinLogFilterMatchActivityChain.py rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/TestDarwinLogFilterMatchActivityChain.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/main.c rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/activity-chain/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/TestDarwinLogFilterMatchActivity.py b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/TestDarwinLogFilterMatchActivity.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/TestDarwinLogFilterMatchActivity.py rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/TestDarwinLogFilterMatchActivity.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/main.c rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/activity/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile b/lldb/test/API/functionalities/darwin_log/filter/exact_match/category/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/category/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/TestDarwinLogFilterMatchCategory.py b/lldb/test/API/functionalities/darwin_log/filter/exact_match/category/TestDarwinLogFilterMatchCategory.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/TestDarwinLogFilterMatchCategory.py rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/category/TestDarwinLogFilterMatchCategory.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/category/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/main.c rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/category/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile b/lldb/test/API/functionalities/darwin_log/filter/exact_match/message/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/message/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/TestDarwinLogFilterMatchMessage.py b/lldb/test/API/functionalities/darwin_log/filter/exact_match/message/TestDarwinLogFilterMatchMessage.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/TestDarwinLogFilterMatchMessage.py rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/message/TestDarwinLogFilterMatchMessage.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/message/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/main.c rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/message/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile b/lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/TestDarwinLogFilterMatchSubsystem.py b/lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/TestDarwinLogFilterMatchSubsystem.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/TestDarwinLogFilterMatchSubsystem.py rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/TestDarwinLogFilterMatchSubsystem.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/main.c b/lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/main.c rename to lldb/test/API/functionalities/darwin_log/filter/exact_match/subsystem/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile b/lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/TestDarwinLogFilterRegexActivityChain.py b/lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/TestDarwinLogFilterRegexActivityChain.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/TestDarwinLogFilterRegexActivityChain.py rename to lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/TestDarwinLogFilterRegexActivityChain.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/main.c rename to lldb/test/API/functionalities/darwin_log/filter/regex/activity-chain/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile b/lldb/test/API/functionalities/darwin_log/filter/regex/activity/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/regex/activity/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/TestDarwinLogFilterRegexActivity.py b/lldb/test/API/functionalities/darwin_log/filter/regex/activity/TestDarwinLogFilterRegexActivity.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/TestDarwinLogFilterRegexActivity.py rename to lldb/test/API/functionalities/darwin_log/filter/regex/activity/TestDarwinLogFilterRegexActivity.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/activity/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/main.c rename to lldb/test/API/functionalities/darwin_log/filter/regex/activity/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile b/lldb/test/API/functionalities/darwin_log/filter/regex/category/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/regex/category/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/TestDarwinLogFilterRegexCategory.py b/lldb/test/API/functionalities/darwin_log/filter/regex/category/TestDarwinLogFilterRegexCategory.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/TestDarwinLogFilterRegexCategory.py rename to lldb/test/API/functionalities/darwin_log/filter/regex/category/TestDarwinLogFilterRegexCategory.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/category/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/main.c rename to lldb/test/API/functionalities/darwin_log/filter/regex/category/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile b/lldb/test/API/functionalities/darwin_log/filter/regex/message/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/regex/message/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/TestDarwinLogFilterRegexMessage.py b/lldb/test/API/functionalities/darwin_log/filter/regex/message/TestDarwinLogFilterRegexMessage.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/TestDarwinLogFilterRegexMessage.py rename to lldb/test/API/functionalities/darwin_log/filter/regex/message/TestDarwinLogFilterRegexMessage.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/message/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/main.c rename to lldb/test/API/functionalities/darwin_log/filter/regex/message/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile b/lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile rename to lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/TestDarwinLogFilterRegexSubsystem.py b/lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/TestDarwinLogFilterRegexSubsystem.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/TestDarwinLogFilterRegexSubsystem.py rename to lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/TestDarwinLogFilterRegexSubsystem.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/main.c b/lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/main.c rename to lldb/test/API/functionalities/darwin_log/filter/regex/subsystem/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile b/lldb/test/API/functionalities/darwin_log/format/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile rename to lldb/test/API/functionalities/darwin_log/format/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/TestDarwinLogMessageFormat.py b/lldb/test/API/functionalities/darwin_log/format/TestDarwinLogMessageFormat.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/TestDarwinLogMessageFormat.py rename to lldb/test/API/functionalities/darwin_log/format/TestDarwinLogMessageFormat.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/main.c b/lldb/test/API/functionalities/darwin_log/format/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/main.c rename to lldb/test/API/functionalities/darwin_log/format/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile b/lldb/test/API/functionalities/darwin_log/source/debug/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile rename to lldb/test/API/functionalities/darwin_log/source/debug/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/TestDarwinLogSourceDebug.py b/lldb/test/API/functionalities/darwin_log/source/debug/TestDarwinLogSourceDebug.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/TestDarwinLogSourceDebug.py rename to lldb/test/API/functionalities/darwin_log/source/debug/TestDarwinLogSourceDebug.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/main.c b/lldb/test/API/functionalities/darwin_log/source/debug/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/main.c rename to lldb/test/API/functionalities/darwin_log/source/debug/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile b/lldb/test/API/functionalities/darwin_log/source/info/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile rename to lldb/test/API/functionalities/darwin_log/source/info/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/TestDarwinLogSourceInfo.py b/lldb/test/API/functionalities/darwin_log/source/info/TestDarwinLogSourceInfo.py rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/TestDarwinLogSourceInfo.py rename to lldb/test/API/functionalities/darwin_log/source/info/TestDarwinLogSourceInfo.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/main.c b/lldb/test/API/functionalities/darwin_log/source/info/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/main.c rename to lldb/test/API/functionalities/darwin_log/source/info/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/.categories b/lldb/test/API/functionalities/data-formatter/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/.categories rename to lldb/test/API/functionalities/data-formatter/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/array_typedef/Makefile b/lldb/test/API/functionalities/data-formatter/array_typedef/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/array_typedef/Makefile rename to lldb/test/API/functionalities/data-formatter/array_typedef/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/array_typedef/TestArrayTypedef.py b/lldb/test/API/functionalities/data-formatter/array_typedef/TestArrayTypedef.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/array_typedef/TestArrayTypedef.py rename to lldb/test/API/functionalities/data-formatter/array_typedef/TestArrayTypedef.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/array_typedef/main.cpp b/lldb/test/API/functionalities/data-formatter/array_typedef/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/array_typedef/main.cpp rename to lldb/test/API/functionalities/data-formatter/array_typedef/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile b/lldb/test/API/functionalities/data-formatter/boolreference/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile rename to lldb/test/API/functionalities/data-formatter/boolreference/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py b/lldb/test/API/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py rename to lldb/test/API/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/main.mm b/lldb/test/API/functionalities/data-formatter/boolreference/main.mm rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/main.mm rename to lldb/test/API/functionalities/data-formatter/boolreference/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile b/lldb/test/API/functionalities/data-formatter/compactvectors/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile rename to lldb/test/API/functionalities/data-formatter/compactvectors/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py b/lldb/test/API/functionalities/data-formatter/compactvectors/TestCompactVectors.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py rename to lldb/test/API/functionalities/data-formatter/compactvectors/TestCompactVectors.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/main.cpp b/lldb/test/API/functionalities/data-formatter/compactvectors/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/main.cpp rename to lldb/test/API/functionalities/data-formatter/compactvectors/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-advanced/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-advanced/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-caching/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-caching/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-caching/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-caching/a.c b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/a.c rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-caching/a.c rename to lldb/test/API/functionalities/data-formatter/data-formatter-caching/a.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-caching/b.c b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/b.c rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-caching/b.c rename to lldb/test/API/functionalities/data-formatter/data-formatter-caching/b.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-categories/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-categories/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-categories/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-categories/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-cpp/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-disabling/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-disabling/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py b/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-globals/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-globals/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/.categories b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/.categories rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCExpr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCExpr.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCExpr.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCExpr.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCKVO.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCKVO.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCKVO.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCKVO.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSBundle.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSBundle.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSBundle.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSBundle.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSContainer.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSContainer.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSContainer.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSContainer.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSData.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSData.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSData.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSData.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSDate.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSDate.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSDate.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSDate.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSError.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSError.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSError.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSError.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSURL.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSURL.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSURL.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSURL.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCPlain.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCPlain.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCPlain.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCPlain.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjNSException.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjNSException.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjNSException.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjNSException.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/cmtime/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/cmtime/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/cmtime/TestDataFormatterCMTime.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/TestDataFormatterCMTime.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/cmtime/TestDataFormatterCMTime.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/TestDataFormatterCMTime.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/cmtime/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/cmtime/main.m rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/main.m rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m rename to lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py b/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/main.m b/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/main.m rename to lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/ftsp.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/ftsp.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-script/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-script/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-script/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-script/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/TestDataFormatterLibcxxBitset.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/TestDataFormatterLibcxxBitset.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/TestDataFormatterLibcxxBitset.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/TestDataFormatterLibcxxBitset.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/TestDataFormatterLibcxxForwardList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/TestDataFormatterLibcxxForwardList.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/TestDataFormatterLibcxxForwardList.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/TestDataFormatterLibcxxForwardList.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/TestDataFormatterLibcxxOptional.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/optional/TestDataFormatterLibcxxOptional.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/TestDataFormatterLibcxxOptional.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/optional/TestDataFormatterLibcxxOptional.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/optional/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/optional/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/TestDataFormatterLibcxxTuple.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/TestDataFormatterLibcxxTuple.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/TestDataFormatterLibcxxTuple.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/TestDataFormatterLibcxxTuple.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/invalid/TestDataFormatterInvalidStdUniquePtr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/invalid/TestDataFormatterInvalidStdUniquePtr.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/invalid/TestDataFormatterInvalidStdUniquePtr.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/invalid/TestDataFormatterInvalidStdUniquePtr.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/invalid/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/invalid/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/invalid/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/invalid/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-synth/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-synth/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/myIntSynthProvider.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/myIntSynthProvider.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/myIntSynthProvider.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/myIntSynthProvider.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-synthval/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-synthval/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py b/lldb/test/API/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py rename to lldb/test/API/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/main.cpp b/lldb/test/API/functionalities/data-formatter/dump_dynamic/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/main.cpp rename to lldb/test/API/functionalities/data-formatter/dump_dynamic/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile b/lldb/test/API/functionalities/data-formatter/format-propagation/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile rename to lldb/test/API/functionalities/data-formatter/format-propagation/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py rename to lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/main.cpp b/lldb/test/API/functionalities/data-formatter/format-propagation/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/main.cpp rename to lldb/test/API/functionalities/data-formatter/format-propagation/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile rename to lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py rename to lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/main.cpp b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/main.cpp rename to lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile b/lldb/test/API/functionalities/data-formatter/hexcaps/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile rename to lldb/test/API/functionalities/data-formatter/hexcaps/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py b/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py rename to lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/main.cpp b/lldb/test/API/functionalities/data-formatter/hexcaps/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/main.cpp rename to lldb/test/API/functionalities/data-formatter/hexcaps/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile b/lldb/test/API/functionalities/data-formatter/language_category_updates/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile rename to lldb/test/API/functionalities/data-formatter/language_category_updates/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py b/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py rename to lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/main.cpp b/lldb/test/API/functionalities/data-formatter/language_category_updates/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/main.cpp rename to lldb/test/API/functionalities/data-formatter/language_category_updates/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile b/lldb/test/API/functionalities/data-formatter/nsarraysynth/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile rename to lldb/test/API/functionalities/data-formatter/nsarraysynth/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py b/lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py rename to lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/main.m b/lldb/test/API/functionalities/data-formatter/nsarraysynth/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/main.m rename to lldb/test/API/functionalities/data-formatter/nsarraysynth/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile rename to lldb/test/API/functionalities/data-formatter/nsdictionarysynth/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py rename to lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/main.m b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/main.m rename to lldb/test/API/functionalities/data-formatter/nsdictionarysynth/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile b/lldb/test/API/functionalities/data-formatter/nssetsynth/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile rename to lldb/test/API/functionalities/data-formatter/nssetsynth/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py b/lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py rename to lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/main.m b/lldb/test/API/functionalities/data-formatter/nssetsynth/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/main.m rename to lldb/test/API/functionalities/data-formatter/nssetsynth/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile b/lldb/test/API/functionalities/data-formatter/ostypeformatting/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile rename to lldb/test/API/functionalities/data-formatter/ostypeformatting/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py b/lldb/test/API/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py rename to lldb/test/API/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/main.mm b/lldb/test/API/functionalities/data-formatter/ostypeformatting/main.mm rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/main.mm rename to lldb/test/API/functionalities/data-formatter/ostypeformatting/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile b/lldb/test/API/functionalities/data-formatter/parray/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile rename to lldb/test/API/functionalities/data-formatter/parray/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/TestPrintArray.py b/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/TestPrintArray.py rename to lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/main.cpp b/lldb/test/API/functionalities/data-formatter/parray/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/main.cpp rename to lldb/test/API/functionalities/data-formatter/parray/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile b/lldb/test/API/functionalities/data-formatter/poarray/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile rename to lldb/test/API/functionalities/data-formatter/poarray/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/TestPrintObjectArray.py b/lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/TestPrintObjectArray.py rename to lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/main.mm b/lldb/test/API/functionalities/data-formatter/poarray/main.mm rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/main.mm rename to lldb/test/API/functionalities/data-formatter/poarray/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile b/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile rename to lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py b/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py rename to lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/main.cpp b/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/main.cpp rename to lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile b/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile rename to lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py b/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py rename to lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/main.cpp b/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/main.cpp rename to lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/provider.py b/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/provider.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/provider.py rename to lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/provider.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile b/lldb/test/API/functionalities/data-formatter/refpointer-recursion/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile rename to lldb/test/API/functionalities/data-formatter/refpointer-recursion/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py b/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py rename to lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/main.cpp b/lldb/test/API/functionalities/data-formatter/refpointer-recursion/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/main.cpp rename to lldb/test/API/functionalities/data-formatter/refpointer-recursion/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py b/lldb/test/API/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py rename to lldb/test/API/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/main.m b/lldb/test/API/functionalities/data-formatter/setvaluefromcstring/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/main.m rename to lldb/test/API/functionalities/data-formatter/setvaluefromcstring/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py b/lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py rename to lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/main.cpp b/lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/main.cpp rename to lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile rename to lldb/test/API/functionalities/data-formatter/summary-string-onfail/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py rename to lldb/test/API/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/main.cpp b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/main.cpp rename to lldb/test/API/functionalities/data-formatter/summary-string-onfail/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile b/lldb/test/API/functionalities/data-formatter/synthcapping/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile rename to lldb/test/API/functionalities/data-formatter/synthcapping/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py b/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py rename to lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py b/lldb/test/API/functionalities/data-formatter/synthcapping/fooSynthProvider.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py rename to lldb/test/API/functionalities/data-formatter/synthcapping/fooSynthProvider.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/main.cpp b/lldb/test/API/functionalities/data-formatter/synthcapping/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/main.cpp rename to lldb/test/API/functionalities/data-formatter/synthcapping/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile b/lldb/test/API/functionalities/data-formatter/synthupdate/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile rename to lldb/test/API/functionalities/data-formatter/synthupdate/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py b/lldb/test/API/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py rename to lldb/test/API/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/main.m b/lldb/test/API/functionalities/data-formatter/synthupdate/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/main.m rename to lldb/test/API/functionalities/data-formatter/synthupdate/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py b/lldb/test/API/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py rename to lldb/test/API/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile rename to lldb/test/API/functionalities/data-formatter/type_summary_list_script/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py rename to lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/main.cpp b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/main.cpp rename to lldb/test/API/functionalities/data-formatter/type_summary_list_script/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/tslsformatters.py b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/tslsformatters.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/tslsformatters.py rename to lldb/test/API/functionalities/data-formatter/type_summary_list_script/tslsformatters.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py b/lldb/test/API/functionalities/data-formatter/typedef_array/TestTypedefArray.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py rename to lldb/test/API/functionalities/data-formatter/typedef_array/TestTypedefArray.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/main.cpp b/lldb/test/API/functionalities/data-formatter/typedef_array/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/main.cpp rename to lldb/test/API/functionalities/data-formatter/typedef_array/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile rename to lldb/test/API/functionalities/data-formatter/user-format-vs-summary/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py rename to lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/main.cpp b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/main.cpp rename to lldb/test/API/functionalities/data-formatter/user-format-vs-summary/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile b/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile rename to lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py b/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py rename to lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp b/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp rename to lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile b/lldb/test/API/functionalities/data-formatter/varscript_formatting/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile rename to lldb/test/API/functionalities/data-formatter/varscript_formatting/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py b/lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py rename to lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/helperfunc.py b/lldb/test/API/functionalities/data-formatter/varscript_formatting/helperfunc.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/helperfunc.py rename to lldb/test/API/functionalities/data-formatter/varscript_formatting/helperfunc.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/main.cpp b/lldb/test/API/functionalities/data-formatter/varscript_formatting/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/main.cpp rename to lldb/test/API/functionalities/data-formatter/varscript_formatting/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile b/lldb/test/API/functionalities/data-formatter/vector-types/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile rename to lldb/test/API/functionalities/data-formatter/vector-types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py rename to lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/main.cpp b/lldb/test/API/functionalities/data-formatter/vector-types/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/main.cpp rename to lldb/test/API/functionalities/data-formatter/vector-types/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile b/lldb/test/API/functionalities/dead-strip/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile rename to lldb/test/API/functionalities/dead-strip/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py b/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py rename from lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py rename to lldb/test/API/functionalities/dead-strip/TestDeadStrip.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/cmds.txt b/lldb/test/API/functionalities/dead-strip/cmds.txt rename from lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/cmds.txt rename to lldb/test/API/functionalities/dead-strip/cmds.txt diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/main.c b/lldb/test/API/functionalities/dead-strip/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/main.c rename to lldb/test/API/functionalities/dead-strip/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile b/lldb/test/API/functionalities/deleted-executable/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile rename to lldb/test/API/functionalities/deleted-executable/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/TestDeletedExecutable.py b/lldb/test/API/functionalities/deleted-executable/TestDeletedExecutable.py rename from lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/TestDeletedExecutable.py rename to lldb/test/API/functionalities/deleted-executable/TestDeletedExecutable.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/main.cpp b/lldb/test/API/functionalities/deleted-executable/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/main.cpp rename to lldb/test/API/functionalities/deleted-executable/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile b/lldb/test/API/functionalities/dynamic_value_child_count/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile rename to lldb/test/API/functionalities/dynamic_value_child_count/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py b/lldb/test/API/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py rename from lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py rename to lldb/test/API/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/pass-to-base.cpp b/lldb/test/API/functionalities/dynamic_value_child_count/pass-to-base.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/pass-to-base.cpp rename to lldb/test/API/functionalities/dynamic_value_child_count/pass-to-base.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile b/lldb/test/API/functionalities/exec/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile rename to lldb/test/API/functionalities/exec/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py b/lldb/test/API/functionalities/exec/TestExec.py rename from lldb/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py rename to lldb/test/API/functionalities/exec/TestExec.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/exec/main.cpp b/lldb/test/API/functionalities/exec/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/exec/main.cpp rename to lldb/test/API/functionalities/exec/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.cpp b/lldb/test/API/functionalities/exec/secondprog.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.cpp rename to lldb/test/API/functionalities/exec/secondprog.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile b/lldb/test/API/functionalities/fat_archives/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile rename to lldb/test/API/functionalities/fat_archives/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py b/lldb/test/API/functionalities/fat_archives/TestFatArchives.py rename from lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py rename to lldb/test/API/functionalities/fat_archives/TestFatArchives.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/a.h b/lldb/test/API/functionalities/fat_archives/a.h rename from lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/a.h rename to lldb/test/API/functionalities/fat_archives/a.h diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/a.c b/lldb/test/API/functionalities/fat_archives/a.c rename from lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/a.c rename to lldb/test/API/functionalities/fat_archives/a.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/main.c b/lldb/test/API/functionalities/fat_archives/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/main.c rename to lldb/test/API/functionalities/fat_archives/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile b/lldb/test/API/functionalities/float-display/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile rename to lldb/test/API/functionalities/float-display/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/float-display/TestFloatDisplay.py b/lldb/test/API/functionalities/float-display/TestFloatDisplay.py rename from lldb/packages/Python/lldbsuite/test/functionalities/float-display/TestFloatDisplay.py rename to lldb/test/API/functionalities/float-display/TestFloatDisplay.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/float-display/main.c b/lldb/test/API/functionalities/float-display/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/float-display/main.c rename to lldb/test/API/functionalities/float-display/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestArmRegisterDefinition.py b/lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestArmRegisterDefinition.py rename to lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestGDBRemoteClient.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteClient.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestGDBRemoteClient.py rename to lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteClient.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestGDBRemoteLoad.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteLoad.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestGDBRemoteLoad.py rename to lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteLoad.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py b/lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py rename to lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNestedRegDefinitions.py b/lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNestedRegDefinitions.py rename to lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNoGPacketSupported.py b/lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNoGPacketSupported.py rename to lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py b/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py rename to lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestPlatformClient.py b/lldb/test/API/functionalities/gdb_remote_client/TestPlatformClient.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestPlatformClient.py rename to lldb/test/API/functionalities/gdb_remote_client/TestPlatformClient.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestRecognizeBreakpoint.py b/lldb/test/API/functionalities/gdb_remote_client/TestRecognizeBreakpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestRecognizeBreakpoint.py rename to lldb/test/API/functionalities/gdb_remote_client/TestRecognizeBreakpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestRegDefinitionInParts.py b/lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestRegDefinitionInParts.py rename to lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestRestartBug.py b/lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestRestartBug.py rename to lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestStopPCs.py b/lldb/test/API/functionalities/gdb_remote_client/TestStopPCs.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestStopPCs.py rename to lldb/test/API/functionalities/gdb_remote_client/TestStopPCs.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py b/lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py rename to lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestThreadSelectionBug.py b/lldb/test/API/functionalities/gdb_remote_client/TestThreadSelectionBug.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestThreadSelectionBug.py rename to lldb/test/API/functionalities/gdb_remote_client/TestThreadSelectionBug.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestWriteMemory.py b/lldb/test/API/functionalities/gdb_remote_client/TestWriteMemory.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestWriteMemory.py rename to lldb/test/API/functionalities/gdb_remote_client/TestWriteMemory.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/a.yaml b/lldb/test/API/functionalities/gdb_remote_client/a.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/a.yaml rename to lldb/test/API/functionalities/gdb_remote_client/a.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/basic_eh_frame.yaml b/lldb/test/API/functionalities/gdb_remote_client/basic_eh_frame.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/basic_eh_frame.yaml rename to lldb/test/API/functionalities/gdb_remote_client/basic_eh_frame.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/gdbclientutils.py b/lldb/test/API/functionalities/gdb_remote_client/gdbclientutils.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/gdbclientutils.py rename to lldb/test/API/functionalities/gdb_remote_client/gdbclientutils.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/operating_system.py b/lldb/test/API/functionalities/gdb_remote_client/operating_system.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/operating_system.py rename to lldb/test/API/functionalities/gdb_remote_client/operating_system.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/operating_system_2.py b/lldb/test/API/functionalities/gdb_remote_client/operating_system_2.py rename from lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/operating_system_2.py rename to lldb/test/API/functionalities/gdb_remote_client/operating_system_2.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/history/TestHistoryRecall.py b/lldb/test/API/functionalities/history/TestHistoryRecall.py rename from lldb/packages/Python/lldbsuite/test/functionalities/history/TestHistoryRecall.py rename to lldb/test/API/functionalities/history/TestHistoryRecall.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile b/lldb/test/API/functionalities/inferior-assert/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile rename to lldb/test/API/functionalities/inferior-assert/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py rename to lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/main.c b/lldb/test/API/functionalities/inferior-assert/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/main.c rename to lldb/test/API/functionalities/inferior-assert/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile b/lldb/test/API/functionalities/inferior-changed/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile rename to lldb/test/API/functionalities/inferior-changed/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/test/API/functionalities/inferior-changed/TestInferiorChanged.py rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py rename to lldb/test/API/functionalities/inferior-changed/TestInferiorChanged.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/main.c b/lldb/test/API/functionalities/inferior-changed/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/main.c rename to lldb/test/API/functionalities/inferior-changed/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/main2.c b/lldb/test/API/functionalities/inferior-changed/main2.c rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/main2.c rename to lldb/test/API/functionalities/inferior-changed/main2.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile b/lldb/test/API/functionalities/inferior-crashing/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile rename to lldb/test/API/functionalities/inferior-crashing/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py rename to lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashingStep.py b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashingStep.py rename to lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/main.c b/lldb/test/API/functionalities/inferior-crashing/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/main.c rename to lldb/test/API/functionalities/inferior-crashing/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile rename to lldb/test/API/functionalities/inferior-crashing/recursive-inferior/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py rename to lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py rename to lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/main.c b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/main.c rename to lldb/test/API/functionalities/inferior-crashing/recursive-inferior/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile b/lldb/test/API/functionalities/inline-stepping/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile rename to lldb/test/API/functionalities/inline-stepping/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py b/lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py rename from lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py rename to lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/calling.cpp b/lldb/test/API/functionalities/inline-stepping/calling.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/calling.cpp rename to lldb/test/API/functionalities/inline-stepping/calling.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile b/lldb/test/API/functionalities/jitloader_gdb/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile rename to lldb/test/API/functionalities/jitloader_gdb/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py b/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py rename from lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py rename to lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/main.c b/lldb/test/API/functionalities/jitloader_gdb/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/main.c rename to lldb/test/API/functionalities/jitloader_gdb/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.c b/lldb/test/API/functionalities/jitloader_gdb/simple.c rename from lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.c rename to lldb/test/API/functionalities/jitloader_gdb/simple.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/lazy-loading/Makefile b/lldb/test/API/functionalities/lazy-loading/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/lazy-loading/Makefile rename to lldb/test/API/functionalities/lazy-loading/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/lazy-loading/TestLazyLoading.py b/lldb/test/API/functionalities/lazy-loading/TestLazyLoading.py rename from lldb/packages/Python/lldbsuite/test/functionalities/lazy-loading/TestLazyLoading.py rename to lldb/test/API/functionalities/lazy-loading/TestLazyLoading.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/lazy-loading/main.cpp b/lldb/test/API/functionalities/lazy-loading/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/lazy-loading/main.cpp rename to lldb/test/API/functionalities/lazy-loading/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/.categories b/lldb/test/API/functionalities/load_unload/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/.categories rename to lldb/test/API/functionalities/load_unload/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile b/lldb/test/API/functionalities/load_unload/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile rename to lldb/test/API/functionalities/load_unload/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py b/lldb/test/API/functionalities/load_unload/TestLoadUnload.py rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py rename to lldb/test/API/functionalities/load_unload/TestLoadUnload.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.cpp b/lldb/test/API/functionalities/load_unload/a.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.cpp rename to lldb/test/API/functionalities/load_unload/a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.cpp b/lldb/test/API/functionalities/load_unload/b.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.cpp rename to lldb/test/API/functionalities/load_unload/b.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.cpp b/lldb/test/API/functionalities/load_unload/c.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.cpp rename to lldb/test/API/functionalities/load_unload/c.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/cmds.txt b/lldb/test/API/functionalities/load_unload/cmds.txt rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/cmds.txt rename to lldb/test/API/functionalities/load_unload/cmds.txt diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.cpp b/lldb/test/API/functionalities/load_unload/d.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.cpp rename to lldb/test/API/functionalities/load_unload/d.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile b/lldb/test/API/functionalities/load_unload/hidden/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile rename to lldb/test/API/functionalities/load_unload/hidden/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/d.cpp b/lldb/test/API/functionalities/load_unload/hidden/d.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/d.cpp rename to lldb/test/API/functionalities/load_unload/hidden/d.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/main.cpp b/lldb/test/API/functionalities/load_unload/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/load_unload/main.cpp rename to lldb/test/API/functionalities/load_unload/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/.categories b/lldb/test/API/functionalities/load_using_paths/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/.categories rename to lldb/test/API/functionalities/load_using_paths/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile b/lldb/test/API/functionalities/load_using_paths/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile rename to lldb/test/API/functionalities/load_using_paths/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/TestLoadUsingPaths.py b/lldb/test/API/functionalities/load_using_paths/TestLoadUsingPaths.py rename from lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/TestLoadUsingPaths.py rename to lldb/test/API/functionalities/load_using_paths/TestLoadUsingPaths.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile b/lldb/test/API/functionalities/load_using_paths/hidden/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile rename to lldb/test/API/functionalities/load_using_paths/hidden/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/d.cpp b/lldb/test/API/functionalities/load_using_paths/hidden/d.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/d.cpp rename to lldb/test/API/functionalities/load_using_paths/hidden/d.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/main.cpp b/lldb/test/API/functionalities/load_using_paths/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/main.cpp rename to lldb/test/API/functionalities/load_using_paths/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile b/lldb/test/API/functionalities/longjmp/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile rename to lldb/test/API/functionalities/longjmp/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py b/lldb/test/API/functionalities/longjmp/TestLongjmp.py rename from lldb/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py rename to lldb/test/API/functionalities/longjmp/TestLongjmp.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/main.c b/lldb/test/API/functionalities/longjmp/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/longjmp/main.c rename to lldb/test/API/functionalities/longjmp/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile b/lldb/test/API/functionalities/memory-region/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile rename to lldb/test/API/functionalities/memory-region/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/TestMemoryRegion.py b/lldb/test/API/functionalities/memory-region/TestMemoryRegion.py rename from lldb/packages/Python/lldbsuite/test/functionalities/memory-region/TestMemoryRegion.py rename to lldb/test/API/functionalities/memory-region/TestMemoryRegion.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/main.cpp b/lldb/test/API/functionalities/memory-region/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/memory-region/main.cpp rename to lldb/test/API/functionalities/memory-region/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile b/lldb/test/API/functionalities/memory/cache/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile rename to lldb/test/API/functionalities/memory/cache/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/TestMemoryCache.py b/lldb/test/API/functionalities/memory/cache/TestMemoryCache.py rename from lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/TestMemoryCache.py rename to lldb/test/API/functionalities/memory/cache/TestMemoryCache.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/main.cpp b/lldb/test/API/functionalities/memory/cache/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/main.cpp rename to lldb/test/API/functionalities/memory/cache/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile b/lldb/test/API/functionalities/memory/find/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile rename to lldb/test/API/functionalities/memory/find/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/TestMemoryFind.py b/lldb/test/API/functionalities/memory/find/TestMemoryFind.py rename from lldb/packages/Python/lldbsuite/test/functionalities/memory/find/TestMemoryFind.py rename to lldb/test/API/functionalities/memory/find/TestMemoryFind.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/main.cpp b/lldb/test/API/functionalities/memory/find/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/memory/find/main.cpp rename to lldb/test/API/functionalities/memory/find/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile b/lldb/test/API/functionalities/memory/read/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile rename to lldb/test/API/functionalities/memory/read/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py b/lldb/test/API/functionalities/memory/read/TestMemoryRead.py rename from lldb/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py rename to lldb/test/API/functionalities/memory/read/TestMemoryRead.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/main.cpp b/lldb/test/API/functionalities/memory/read/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/memory/read/main.cpp rename to lldb/test/API/functionalities/memory/read/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile b/lldb/test/API/functionalities/mtc/simple/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile rename to lldb/test/API/functionalities/mtc/simple/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/TestMTCSimple.py b/lldb/test/API/functionalities/mtc/simple/TestMTCSimple.py rename from lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/TestMTCSimple.py rename to lldb/test/API/functionalities/mtc/simple/TestMTCSimple.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/main.m b/lldb/test/API/functionalities/mtc/simple/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/main.m rename to lldb/test/API/functionalities/mtc/simple/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py b/lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py rename from lldb/packages/Python/lldbsuite/test/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py rename to lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/multiword-commands/TestMultiWordCommands.py b/lldb/test/API/functionalities/multiword-commands/TestMultiWordCommands.py rename from lldb/packages/Python/lldbsuite/test/functionalities/multiword-commands/TestMultiWordCommands.py rename to lldb/test/API/functionalities/multiword-commands/TestMultiWordCommands.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile b/lldb/test/API/functionalities/non-overlapping-index-variable-i/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile rename to lldb/test/API/functionalities/non-overlapping-index-variable-i/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py rename from lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py rename to lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/main.cpp b/lldb/test/API/functionalities/non-overlapping-index-variable-i/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/main.cpp rename to lldb/test/API/functionalities/non-overlapping-index-variable-i/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py b/lldb/test/API/functionalities/object-file/TestImageListMultiArchitecture.py rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py rename to lldb/test/API/functionalities/object-file/TestImageListMultiArchitecture.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3 b/lldb/test/API/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3 rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3 rename to lldb/test/API/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3 b/lldb/test/API/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3 rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3 rename to lldb/test/API/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3 b/lldb/test/API/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3 rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3 rename to lldb/test/API/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre b/lldb/test/API/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre rename to lldb/test/API/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2 b/lldb/test/API/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2 rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2 rename to lldb/test/API/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-unknown-kalimba_arch4-kcc-36 b/lldb/test/API/functionalities/object-file/bin/hello-unknown-kalimba_arch4-kcc-36 rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-unknown-kalimba_arch4-kcc-36 rename to lldb/test/API/functionalities/object-file/bin/hello-unknown-kalimba_arch4-kcc-36 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-unknown-kalimba_arch5-kcc-39 b/lldb/test/API/functionalities/object-file/bin/hello-unknown-kalimba_arch5-kcc-39 rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-unknown-kalimba_arch5-kcc-39 rename to lldb/test/API/functionalities/object-file/bin/hello-unknown-kalimba_arch5-kcc-39 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello.c b/lldb/test/API/functionalities/object-file/bin/hello.c rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello.c rename to lldb/test/API/functionalities/object-file/bin/hello.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello.cpp b/lldb/test/API/functionalities/object-file/bin/hello.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello.cpp rename to lldb/test/API/functionalities/object-file/bin/hello.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/optimized_code/Makefile b/lldb/test/API/functionalities/optimized_code/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/optimized_code/Makefile rename to lldb/test/API/functionalities/optimized_code/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/optimized_code/TestNoASanExceptionAfterEvalOP_piece.py b/lldb/test/API/functionalities/optimized_code/TestNoASanExceptionAfterEvalOP_piece.py rename from lldb/packages/Python/lldbsuite/test/functionalities/optimized_code/TestNoASanExceptionAfterEvalOP_piece.py rename to lldb/test/API/functionalities/optimized_code/TestNoASanExceptionAfterEvalOP_piece.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/optimized_code/main.cpp b/lldb/test/API/functionalities/optimized_code/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/optimized_code/main.cpp rename to lldb/test/API/functionalities/optimized_code/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile b/lldb/test/API/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile rename to lldb/test/API/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/TestBasicEntryValuesX86_64.py b/lldb/test/API/functionalities/param_entry_vals/basic_entry_values_x86_64/TestBasicEntryValuesX86_64.py rename from lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/TestBasicEntryValuesX86_64.py rename to lldb/test/API/functionalities/param_entry_vals/basic_entry_values_x86_64/TestBasicEntryValuesX86_64.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/main.cpp b/lldb/test/API/functionalities/param_entry_vals/basic_entry_values_x86_64/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/main.cpp rename to lldb/test/API/functionalities/param_entry_vals/basic_entry_values_x86_64/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py b/lldb/test/API/functionalities/paths/TestPaths.py rename from lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py rename to lldb/test/API/functionalities/paths/TestPaths.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile b/lldb/test/API/functionalities/plugins/command_plugin/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile rename to lldb/test/API/functionalities/plugins/command_plugin/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/TestPluginCommands.py b/lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py rename from lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/TestPluginCommands.py rename to lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/plugin.cpp.template b/lldb/test/API/functionalities/plugins/command_plugin/plugin.cpp.template rename from lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/plugin.cpp.template rename to lldb/test/API/functionalities/plugins/command_plugin/plugin.cpp.template diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile b/lldb/test/API/functionalities/plugins/python_os_plugin/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile rename to lldb/test/API/functionalities/plugins/python_os_plugin/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py b/lldb/test/API/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py rename from lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py rename to lldb/test/API/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/main.c b/lldb/test/API/functionalities/plugins/python_os_plugin/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/main.c rename to lldb/test/API/functionalities/plugins/python_os_plugin/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system.py b/lldb/test/API/functionalities/plugins/python_os_plugin/operating_system.py rename from lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system.py rename to lldb/test/API/functionalities/plugins/python_os_plugin/operating_system.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system2.py b/lldb/test/API/functionalities/plugins/python_os_plugin/operating_system2.py rename from lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system2.py rename to lldb/test/API/functionalities/plugins/python_os_plugin/operating_system2.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/TestLinuxCore.py b/lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/TestLinuxCore.py rename to lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.c b/lldb/test/API/functionalities/postmortem/elf-core/altmain.c rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.c rename to lldb/test/API/functionalities/postmortem/elf-core/altmain.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.core b/lldb/test/API/functionalities/postmortem/elf-core/altmain.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.core rename to lldb/test/API/functionalities/postmortem/elf-core/altmain.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.out b/lldb/test/API/functionalities/postmortem/elf-core/altmain.out rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.out rename to lldb/test/API/functionalities/postmortem/elf-core/altmain.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/fpr_sse.cpp b/lldb/test/API/functionalities/postmortem/elf-core/fpr_sse.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/fpr_sse.cpp rename to lldb/test/API/functionalities/postmortem/elf-core/fpr_sse.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/TestGCore.py b/lldb/test/API/functionalities/postmortem/elf-core/gcore/TestGCore.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/TestGCore.py rename to lldb/test/API/functionalities/postmortem/elf-core/gcore/TestGCore.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/linux-i386.core b/lldb/test/API/functionalities/postmortem/elf-core/gcore/linux-i386.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/linux-i386.core rename to lldb/test/API/functionalities/postmortem/elf-core/gcore/linux-i386.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/linux-x86_64.core b/lldb/test/API/functionalities/postmortem/elf-core/gcore/linux-x86_64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/linux-x86_64.core rename to lldb/test/API/functionalities/postmortem/elf-core/gcore/linux-x86_64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.cpp b/lldb/test/API/functionalities/postmortem/elf-core/gcore/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.cpp rename to lldb/test/API/functionalities/postmortem/elf-core/gcore/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk b/lldb/test/API/functionalities/postmortem/elf-core/gcore/main.mk rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk rename to lldb/test/API/functionalities/postmortem/elf-core/gcore/main.mk diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/make-core.sh b/lldb/test/API/functionalities/postmortem/elf-core/gcore/make-core.sh rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/make-core.sh rename to lldb/test/API/functionalities/postmortem/elf-core/gcore/make-core.sh diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-arm.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-arm.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-arm.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-arm.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-fpr_sse_i386.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-fpr_sse_i386.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-fpr_sse_i386.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-fpr_sse_i386.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-fpr_sse_x86_64.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-fpr_sse_x86_64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-fpr_sse_x86_64.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-fpr_sse_x86_64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-i386.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-i386.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-i386.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-i386.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-i386.out b/lldb/test/API/functionalities/postmortem/elf-core/linux-i386.out rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-i386.out rename to lldb/test/API/functionalities/postmortem/elf-core/linux-i386.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mips64el-gnuabi64.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-mips64el-gnuabi64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mips64el-gnuabi64.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-mips64el-gnuabi64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mips64el-gnuabi64.out b/lldb/test/API/functionalities/postmortem/elf-core/linux-mips64el-gnuabi64.out rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mips64el-gnuabi64.out rename to lldb/test/API/functionalities/postmortem/elf-core/linux-mips64el-gnuabi64.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mips64el-gnuabin32.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-mips64el-gnuabin32.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mips64el-gnuabin32.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-mips64el-gnuabin32.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mips64el-gnuabin32.out b/lldb/test/API/functionalities/postmortem/elf-core/linux-mips64el-gnuabin32.out rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mips64el-gnuabin32.out rename to lldb/test/API/functionalities/postmortem/elf-core/linux-mips64el-gnuabin32.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mipsel-gnuabio32.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-mipsel-gnuabio32.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mipsel-gnuabio32.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-mipsel-gnuabio32.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mipsel-gnuabio32.out b/lldb/test/API/functionalities/postmortem/elf-core/linux-mipsel-gnuabio32.out rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-mipsel-gnuabio32.out rename to lldb/test/API/functionalities/postmortem/elf-core/linux-mipsel-gnuabio32.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-ppc64le.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-ppc64le.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-ppc64le.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-ppc64le.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-ppc64le.out b/lldb/test/API/functionalities/postmortem/elf-core/linux-ppc64le.out rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-ppc64le.out rename to lldb/test/API/functionalities/postmortem/elf-core/linux-ppc64le.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-s390x.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-s390x.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-s390x.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-s390x.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-s390x.out b/lldb/test/API/functionalities/postmortem/elf-core/linux-s390x.out rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-s390x.out rename to lldb/test/API/functionalities/postmortem/elf-core/linux-s390x.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-x86_64.core b/lldb/test/API/functionalities/postmortem/elf-core/linux-x86_64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-x86_64.core rename to lldb/test/API/functionalities/postmortem/elf-core/linux-x86_64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-x86_64.out b/lldb/test/API/functionalities/postmortem/elf-core/linux-x86_64.out rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-x86_64.out rename to lldb/test/API/functionalities/postmortem/elf-core/linux-x86_64.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/main.c b/lldb/test/API/functionalities/postmortem/elf-core/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/main.c rename to lldb/test/API/functionalities/postmortem/elf-core/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/make-core.sh b/lldb/test/API/functionalities/postmortem/elf-core/make-core.sh rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/make-core.sh rename to lldb/test/API/functionalities/postmortem/elf-core/make-core.sh diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/TestLinuxCoreThreads.py b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/TestLinuxCoreThreads.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/TestLinuxCoreThreads.py rename to lldb/test/API/functionalities/postmortem/elf-core/thread_crash/TestLinuxCoreThreads.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/linux-i386.core b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/linux-i386.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/linux-i386.core rename to lldb/test/API/functionalities/postmortem/elf-core/thread_crash/linux-i386.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/linux-x86_64.core b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/linux-x86_64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/linux-x86_64.core rename to lldb/test/API/functionalities/postmortem/elf-core/thread_crash/linux-x86_64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.cpp b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.cpp rename to lldb/test/API/functionalities/postmortem/elf-core/thread_crash/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/main.mk rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk rename to lldb/test/API/functionalities/postmortem/elf-core/thread_crash/main.mk diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/make-core.sh b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/make-core.sh rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/make-core.sh rename to lldb/test/API/functionalities/postmortem/elf-core/thread_crash/make-core.sh diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/TestMachCore.py b/lldb/test/API/functionalities/postmortem/mach-core/TestMachCore.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/TestMachCore.py rename to lldb/test/API/functionalities/postmortem/mach-core/TestMachCore.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/operating_system.py b/lldb/test/API/functionalities/postmortem/mach-core/operating_system.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/operating_system.py rename to lldb/test/API/functionalities/postmortem/mach-core/operating_system.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/test.core.yaml b/lldb/test/API/functionalities/postmortem/mach-core/test.core.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/test.core.yaml rename to lldb/test/API/functionalities/postmortem/mach-core/test.core.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpNew.py b/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpNew.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpNew.py rename to lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpNew.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py b/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py rename to lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm-linux.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/arm-linux.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm-linux.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/arm-linux.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm-macos.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/arm-macos.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm-macos.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/arm-macos.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm64-macos.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/arm64-macos.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm64-macos.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/arm64-macos.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/install_breakpad.cpp b/lldb/test/API/functionalities/postmortem/minidump-new/install_breakpad.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/install_breakpad.cpp rename to lldb/test/API/functionalities/postmortem/minidump-new/install_breakpad.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmatch.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/libuuidmatch.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmatch.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/libuuidmatch.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmismatch.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/libuuidmismatch.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmismatch.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/libuuidmismatch.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-match.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-match.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-match.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-match.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-mismatch.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-mismatch.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-mismatch.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-mismatch.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-same-uuids.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-same-uuids.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-same-uuids.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-same-uuids.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-16.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-16.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-16.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-16.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-20.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-20.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-20.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-20.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-zero.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-zero.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-zero.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-elf-build-id-zero.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-no-age.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-no-age.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-no-age.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-no-age.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-with-age.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-with-age.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-uuids-with-age.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-uuids-with-age.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-zero-uuids.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-zero-uuids.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-zero-uuids.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-arm-zero-uuids.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64 b/lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64 rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64 rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64.cpp b/lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64.cpp rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64.dmp b/lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64.dmp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64.dmp rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64.dmp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed b/lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed.cpp b/lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed.cpp rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed.dmp b/lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed.dmp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed.dmp rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64_not_crashed.dmp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64_null_signal.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64_null_signal.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-x86_64_null_signal.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/linux-x86_64_null_signal.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/macos-arm-uuids-no-age.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/macos-arm-uuids-no-age.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/macos-arm-uuids-no-age.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/macos-arm-uuids-no-age.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/makefile.txt b/lldb/test/API/functionalities/postmortem/minidump-new/makefile.txt rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/makefile.txt rename to lldb/test/API/functionalities/postmortem/minidump-new/makefile.txt diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/regions-linux-map.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/regions-linux-map.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/regions-linux-map.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/regions-linux-map.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/relative_module_name.yaml b/lldb/test/API/functionalities/postmortem/minidump-new/relative_module_name.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/relative_module_name.yaml rename to lldb/test/API/functionalities/postmortem/minidump-new/relative_module_name.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile b/lldb/test/API/functionalities/postmortem/minidump/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile rename to lldb/test/API/functionalities/postmortem/minidump/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py b/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py rename to lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz.cpp b/lldb/test/API/functionalities/postmortem/minidump/fizzbuzz.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz.cpp rename to lldb/test/API/functionalities/postmortem/minidump/fizzbuzz.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz.syms b/lldb/test/API/functionalities/postmortem/minidump/fizzbuzz.syms rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz.syms rename to lldb/test/API/functionalities/postmortem/minidump/fizzbuzz.syms diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz_no_heap.dmp b/lldb/test/API/functionalities/postmortem/minidump/fizzbuzz_no_heap.dmp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz_no_heap.dmp rename to lldb/test/API/functionalities/postmortem/minidump/fizzbuzz_no_heap.dmp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/main.cpp b/lldb/test/API/functionalities/postmortem/minidump/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/main.cpp rename to lldb/test/API/functionalities/postmortem/minidump/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64 b/lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64 rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64 rename to lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64.core b/lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64.core rename to lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.amd64 b/lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.amd64 rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.amd64 rename to lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.amd64 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.amd64.core b/lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.amd64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.amd64.core rename to lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.amd64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.c b/lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.c rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.c rename to lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64 b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64 rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64 rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64.core b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64.core rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.amd64 b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.amd64 rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.amd64 rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.amd64 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.amd64.core b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.amd64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.amd64.core rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.amd64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.c b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.c rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.c rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64 b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64 rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64 rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64.core b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64.core rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.amd64 b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.amd64 rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.amd64 rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.amd64 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.amd64.core b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.amd64.core rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.amd64.core rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.amd64.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.c b/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.c rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.c rename to lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/GNUmakefile b/lldb/test/API/functionalities/postmortem/netbsd-core/GNUmakefile rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/GNUmakefile rename to lldb/test/API/functionalities/postmortem/netbsd-core/GNUmakefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/TestNetBSDCore.py b/lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/TestNetBSDCore.py rename to lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py b/lldb/test/API/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py rename to lldb/test/API/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/wow64_minidump/fizzbuzz.cpp b/lldb/test/API/functionalities/postmortem/wow64_minidump/fizzbuzz.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/wow64_minidump/fizzbuzz.cpp rename to lldb/test/API/functionalities/postmortem/wow64_minidump/fizzbuzz.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/wow64_minidump/fizzbuzz_wow64.dmp b/lldb/test/API/functionalities/postmortem/wow64_minidump/fizzbuzz_wow64.dmp rename from lldb/packages/Python/lldbsuite/test/functionalities/postmortem/wow64_minidump/fizzbuzz_wow64.dmp rename to lldb/test/API/functionalities/postmortem/wow64_minidump/fizzbuzz_wow64.dmp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile b/lldb/test/API/functionalities/pre_run_dylibs/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile rename to lldb/test/API/functionalities/pre_run_dylibs/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/TestPreRunDylibs.py b/lldb/test/API/functionalities/pre_run_dylibs/TestPreRunDylibs.py rename from lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/TestPreRunDylibs.py rename to lldb/test/API/functionalities/pre_run_dylibs/TestPreRunDylibs.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/foo.h b/lldb/test/API/functionalities/pre_run_dylibs/foo.h rename from lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/foo.h rename to lldb/test/API/functionalities/pre_run_dylibs/foo.h diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/foo.cpp b/lldb/test/API/functionalities/pre_run_dylibs/foo.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/foo.cpp rename to lldb/test/API/functionalities/pre_run_dylibs/foo.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/main.cpp b/lldb/test/API/functionalities/pre_run_dylibs/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/main.cpp rename to lldb/test/API/functionalities/pre_run_dylibs/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile b/lldb/test/API/functionalities/process_group/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile rename to lldb/test/API/functionalities/process_group/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py b/lldb/test/API/functionalities/process_group/TestChangeProcessGroup.py rename from lldb/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py rename to lldb/test/API/functionalities/process_group/TestChangeProcessGroup.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_group/main.c b/lldb/test/API/functionalities/process_group/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/process_group/main.c rename to lldb/test/API/functionalities/process_group/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile b/lldb/test/API/functionalities/process_save_core/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile rename to lldb/test/API/functionalities/process_save_core/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/TestProcessSaveCore.py b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py rename from lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/TestProcessSaveCore.py rename to lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/main.cpp b/lldb/test/API/functionalities/process_save_core/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/main.cpp rename to lldb/test/API/functionalities/process_save_core/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile b/lldb/test/API/functionalities/ptr_refs/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile rename to lldb/test/API/functionalities/ptr_refs/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/TestPtrRefs.py b/lldb/test/API/functionalities/ptr_refs/TestPtrRefs.py rename from lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/TestPtrRefs.py rename to lldb/test/API/functionalities/ptr_refs/TestPtrRefs.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/main.c b/lldb/test/API/functionalities/ptr_refs/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/main.c rename to lldb/test/API/functionalities/ptr_refs/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile b/lldb/test/API/functionalities/recursion/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile rename to lldb/test/API/functionalities/recursion/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py b/lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py rename from lldb/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py rename to lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/recursion/main.cpp b/lldb/test/API/functionalities/recursion/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/recursion/main.cpp rename to lldb/test/API/functionalities/recursion/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile b/lldb/test/API/functionalities/rerun/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile rename to lldb/test/API/functionalities/rerun/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py b/lldb/test/API/functionalities/rerun/TestRerun.py rename from lldb/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py rename to lldb/test/API/functionalities/rerun/TestRerun.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/rerun/main.cpp b/lldb/test/API/functionalities/rerun/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/rerun/main.cpp rename to lldb/test/API/functionalities/rerun/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile b/lldb/test/API/functionalities/return-value/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile rename to lldb/test/API/functionalities/return-value/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py b/lldb/test/API/functionalities/return-value/TestReturnValue.py rename from lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py rename to lldb/test/API/functionalities/return-value/TestReturnValue.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/call-func.cpp b/lldb/test/API/functionalities/return-value/call-func.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/return-value/call-func.cpp rename to lldb/test/API/functionalities/return-value/call-func.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile b/lldb/test/API/functionalities/set-data/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile rename to lldb/test/API/functionalities/set-data/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py b/lldb/test/API/functionalities/set-data/TestSetData.py rename from lldb/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py rename to lldb/test/API/functionalities/set-data/TestSetData.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/main.m b/lldb/test/API/functionalities/set-data/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/set-data/main.m rename to lldb/test/API/functionalities/set-data/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/show_location/TestShowLocationDwarf5.py b/lldb/test/API/functionalities/show_location/TestShowLocationDwarf5.py rename from lldb/packages/Python/lldbsuite/test/functionalities/show_location/TestShowLocationDwarf5.py rename to lldb/test/API/functionalities/show_location/TestShowLocationDwarf5.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/show_location/a.yaml b/lldb/test/API/functionalities/show_location/a.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/show_location/a.yaml rename to lldb/test/API/functionalities/show_location/a.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile b/lldb/test/API/functionalities/signal/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile rename to lldb/test/API/functionalities/signal/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py b/lldb/test/API/functionalities/signal/TestSendSignal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py rename to lldb/test/API/functionalities/signal/TestSendSignal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile b/lldb/test/API/functionalities/signal/handle-abrt/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile rename to lldb/test/API/functionalities/signal/handle-abrt/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/TestHandleAbort.py b/lldb/test/API/functionalities/signal/handle-abrt/TestHandleAbort.py rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/TestHandleAbort.py rename to lldb/test/API/functionalities/signal/handle-abrt/TestHandleAbort.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/main.c b/lldb/test/API/functionalities/signal/handle-abrt/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/main.c rename to lldb/test/API/functionalities/signal/handle-abrt/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile b/lldb/test/API/functionalities/signal/handle-segv/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile rename to lldb/test/API/functionalities/signal/handle-segv/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py b/lldb/test/API/functionalities/signal/handle-segv/TestHandleSegv.py rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py rename to lldb/test/API/functionalities/signal/handle-segv/TestHandleSegv.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/main.c b/lldb/test/API/functionalities/signal/handle-segv/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/main.c rename to lldb/test/API/functionalities/signal/handle-segv/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/main.c b/lldb/test/API/functionalities/signal/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/main.c rename to lldb/test/API/functionalities/signal/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile b/lldb/test/API/functionalities/signal/raise/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile rename to lldb/test/API/functionalities/signal/raise/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py b/lldb/test/API/functionalities/signal/raise/TestRaise.py rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py rename to lldb/test/API/functionalities/signal/raise/TestRaise.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/main.c b/lldb/test/API/functionalities/signal/raise/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/main.c rename to lldb/test/API/functionalities/signal/raise/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/source-map/TestTargetSourceMap.py b/lldb/test/API/functionalities/source-map/TestTargetSourceMap.py rename from lldb/packages/Python/lldbsuite/test/functionalities/source-map/TestTargetSourceMap.py rename to lldb/test/API/functionalities/source-map/TestTargetSourceMap.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/source-map/Trivial/main.c b/lldb/test/API/functionalities/source-map/Trivial/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/source-map/Trivial/main.c rename to lldb/test/API/functionalities/source-map/Trivial/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/source-map/a.yaml b/lldb/test/API/functionalities/source-map/a.yaml rename from lldb/packages/Python/lldbsuite/test/functionalities/source-map/a.yaml rename to lldb/test/API/functionalities/source-map/a.yaml diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile b/lldb/test/API/functionalities/stats_api/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile rename to lldb/test/API/functionalities/stats_api/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/TestStatisticsAPI.py b/lldb/test/API/functionalities/stats_api/TestStatisticsAPI.py rename from lldb/packages/Python/lldbsuite/test/functionalities/stats_api/TestStatisticsAPI.py rename to lldb/test/API/functionalities/stats_api/TestStatisticsAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/main.c b/lldb/test/API/functionalities/stats_api/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/stats_api/main.c rename to lldb/test/API/functionalities/stats_api/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile b/lldb/test/API/functionalities/step-avoids-no-debug/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile rename to lldb/test/API/functionalities/step-avoids-no-debug/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py b/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py rename from lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py rename to lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/with-debug.c b/lldb/test/API/functionalities/step-avoids-no-debug/with-debug.c rename from lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/with-debug.c rename to lldb/test/API/functionalities/step-avoids-no-debug/with-debug.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/without-debug.c b/lldb/test/API/functionalities/step-avoids-no-debug/without-debug.c rename from lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/without-debug.c rename to lldb/test/API/functionalities/step-avoids-no-debug/without-debug.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile b/lldb/test/API/functionalities/step_scripted/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile rename to lldb/test/API/functionalities/step_scripted/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Steps.py b/lldb/test/API/functionalities/step_scripted/Steps.py rename from lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Steps.py rename to lldb/test/API/functionalities/step_scripted/Steps.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/TestStepScripted.py b/lldb/test/API/functionalities/step_scripted/TestStepScripted.py rename from lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/TestStepScripted.py rename to lldb/test/API/functionalities/step_scripted/TestStepScripted.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/main.c b/lldb/test/API/functionalities/step_scripted/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/main.c rename to lldb/test/API/functionalities/step_scripted/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile rename to lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/TestAmbiguousTailCallSeq1.py b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/TestAmbiguousTailCallSeq1.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/TestAmbiguousTailCallSeq1.py rename to lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/TestAmbiguousTailCallSeq1.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/main.cpp b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq1/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile rename to lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/TestAmbiguousTailCallSeq2.py b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/TestAmbiguousTailCallSeq2.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/TestAmbiguousTailCallSeq2.py rename to lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/TestAmbiguousTailCallSeq2.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/main.cpp b/lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/ambiguous_tail_call_seq2/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Makefile b/lldb/test/API/functionalities/tail_call_frames/cross_dso/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Makefile rename to lldb/test/API/functionalities/tail_call_frames/cross_dso/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/One.mk b/lldb/test/API/functionalities/tail_call_frames/cross_dso/One.mk rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/One.mk rename to lldb/test/API/functionalities/tail_call_frames/cross_dso/One.mk diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/One/One.c b/lldb/test/API/functionalities/tail_call_frames/cross_dso/One/One.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/One/One.c rename to lldb/test/API/functionalities/tail_call_frames/cross_dso/One/One.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py rename to lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Two.mk b/lldb/test/API/functionalities/tail_call_frames/cross_dso/Two.mk rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Two.mk rename to lldb/test/API/functionalities/tail_call_frames/cross_dso/Two.mk diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Two/Two.c b/lldb/test/API/functionalities/tail_call_frames/cross_dso/Two/Two.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Two/Two.c rename to lldb/test/API/functionalities/tail_call_frames/cross_dso/Two/Two.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/main.c b/lldb/test/API/functionalities/tail_call_frames/cross_dso/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/main.c rename to lldb/test/API/functionalities/tail_call_frames/cross_dso/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/shared.h b/lldb/test/API/functionalities/tail_call_frames/cross_dso/shared.h rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/shared.h rename to lldb/test/API/functionalities/tail_call_frames/cross_dso/shared.h diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/Makefile b/lldb/test/API/functionalities/tail_call_frames/cross_object/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/Makefile rename to lldb/test/API/functionalities/tail_call_frames/cross_object/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/One.c b/lldb/test/API/functionalities/tail_call_frames/cross_object/One.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/One.c rename to lldb/test/API/functionalities/tail_call_frames/cross_object/One.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py rename to lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/Two.c b/lldb/test/API/functionalities/tail_call_frames/cross_object/Two.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/Two.c rename to lldb/test/API/functionalities/tail_call_frames/cross_object/Two.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/main.c b/lldb/test/API/functionalities/tail_call_frames/cross_object/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/main.c rename to lldb/test/API/functionalities/tail_call_frames/cross_object/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/shared.h b/lldb/test/API/functionalities/tail_call_frames/cross_object/shared.h rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_object/shared.h rename to lldb/test/API/functionalities/tail_call_frames/cross_object/shared.h diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile b/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile rename to lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py b/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py rename to lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/main.cpp b/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile b/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile rename to lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py b/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py rename to lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/main.cpp b/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile b/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile rename to lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py b/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py rename to lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/main.cpp b/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile b/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile rename to lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py rename to lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/main.cpp b/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile b/lldb/test/API/functionalities/tail_call_frames/sbapi_support/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile rename to lldb/test/API/functionalities/tail_call_frames/sbapi_support/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py b/lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py rename to lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/main.cpp b/lldb/test/API/functionalities/tail_call_frames/sbapi_support/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/sbapi_support/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile rename to lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py rename to lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/main.cpp b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile rename to lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/TestSteppingOutWithArtificialFrames.py b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/TestSteppingOutWithArtificialFrames.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/TestSteppingOutWithArtificialFrames.py rename to lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/TestSteppingOutWithArtificialFrames.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/main.cpp b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile b/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile rename to lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py rename to lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/main.cpp b/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/main.cpp rename to lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile b/lldb/test/API/functionalities/target-new-solib-notifications/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile rename to lldb/test/API/functionalities/target-new-solib-notifications/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py b/lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py rename from lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py rename to lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/main.cpp b/lldb/test/API/functionalities/target-new-solib-notifications/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/main.cpp rename to lldb/test/API/functionalities/target-new-solib-notifications/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile b/lldb/test/API/functionalities/target_var/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile rename to lldb/test/API/functionalities/target_var/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/TestTargetVar.py b/lldb/test/API/functionalities/target_var/TestTargetVar.py rename from lldb/packages/Python/lldbsuite/test/functionalities/target_var/TestTargetVar.py rename to lldb/test/API/functionalities/target_var/TestTargetVar.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/globals.c b/lldb/test/API/functionalities/target_var/globals.c rename from lldb/packages/Python/lldbsuite/test/functionalities/target_var/globals.c rename to lldb/test/API/functionalities/target_var/globals.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/globals.ll b/lldb/test/API/functionalities/target_var/globals.ll rename from lldb/packages/Python/lldbsuite/test/functionalities/target_var/globals.ll rename to lldb/test/API/functionalities/target_var/globals.ll diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/testid/TestTestId.py b/lldb/test/API/functionalities/testid/TestTestId.py rename from lldb/packages/Python/lldbsuite/test/functionalities/testid/TestTestId.py rename to lldb/test/API/functionalities/testid/TestTestId.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile b/lldb/test/API/functionalities/thread/backtrace_all/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile rename to lldb/test/API/functionalities/thread/backtrace_all/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/ParallelTask.cpp b/lldb/test/API/functionalities/thread/backtrace_all/ParallelTask.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/ParallelTask.cpp rename to lldb/test/API/functionalities/thread/backtrace_all/ParallelTask.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/TestBacktraceAll.py b/lldb/test/API/functionalities/thread/backtrace_all/TestBacktraceAll.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/TestBacktraceAll.py rename to lldb/test/API/functionalities/thread/backtrace_all/TestBacktraceAll.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile b/lldb/test/API/functionalities/thread/backtrace_limit/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile rename to lldb/test/API/functionalities/thread/backtrace_limit/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/TestBacktraceLimit.py b/lldb/test/API/functionalities/thread/backtrace_limit/TestBacktraceLimit.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/TestBacktraceLimit.py rename to lldb/test/API/functionalities/thread/backtrace_limit/TestBacktraceLimit.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/main.cpp b/lldb/test/API/functionalities/thread/backtrace_limit/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/main.cpp rename to lldb/test/API/functionalities/thread/backtrace_limit/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile b/lldb/test/API/functionalities/thread/break_after_join/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile rename to lldb/test/API/functionalities/thread/break_after_join/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py rename to lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/main.cpp b/lldb/test/API/functionalities/thread/break_after_join/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/main.cpp rename to lldb/test/API/functionalities/thread/break_after_join/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile b/lldb/test/API/functionalities/thread/concurrent_events/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile rename to lldb/test/API/functionalities/thread/concurrent_events/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentBreakpointDelayBreakpointOneSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointDelayBreakpointOneSignal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentBreakpointDelayBreakpointOneSignal.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointDelayBreakpointOneSignal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentBreakpointOneDelayBreakpointThreads.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointOneDelayBreakpointThreads.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentBreakpointOneDelayBreakpointThreads.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointOneDelayBreakpointThreads.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentBreakpointsDelayedBreakpointOneWatchpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointsDelayedBreakpointOneWatchpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentBreakpointsDelayedBreakpointOneWatchpoint.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointsDelayedBreakpointOneWatchpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelaySignalBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelaySignalBreak.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelaySignalWatch.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalWatch.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelaySignalWatch.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalWatch.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelayWatchBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayWatchBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelayWatchBreak.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayWatchBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointSignal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointSignal.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointSignal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointWatchpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointWatchpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointWatchpoint.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointWatchpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManySignals.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManySignals.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentNWatchNBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentNWatchNBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentNWatchNBreak.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentNWatchNBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalBreak.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalDelayBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalDelayBreak.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalDelayWatch.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayWatch.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalDelayWatch.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayWatch.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalNWatchNBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalNWatchNBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalNWatchNBreak.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalNWatchNBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalWatch.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatch.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalWatch.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatch.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalWatchBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatchBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentSignalWatchBreak.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatchBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointThreads.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointThreads.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointThreads.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointThreads.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneDelaySignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneDelaySignal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneDelaySignal.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneDelaySignal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneWatchpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneWatchpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneWatchpoint.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneWatchpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointThreads.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointThreads.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointThreads.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointThreads.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneBreakpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneBreakpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneBreakpoint.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneBreakpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneDelayBreakpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneDelayBreakpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneDelayBreakpoint.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneDelayBreakpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneSignal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneSignal.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneSignal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentWatchBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentWatchBreak.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentWatchBreakDelay.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreakDelay.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentWatchBreakDelay.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreakDelay.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentWatchpointDelayWatchpointOneBreakpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointDelayWatchpointOneBreakpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentWatchpointDelayWatchpointOneBreakpoint.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointDelayWatchpointOneBreakpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentWatchpointWithDelayWatchpointThreads.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointWithDelayWatchpointThreads.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentWatchpointWithDelayWatchpointThreads.py rename to lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointWithDelayWatchpointThreads.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/main.cpp b/lldb/test/API/functionalities/thread/concurrent_events/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/main.cpp rename to lldb/test/API/functionalities/thread/concurrent_events/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile b/lldb/test/API/functionalities/thread/crash_during_step/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile rename to lldb/test/API/functionalities/thread/crash_during_step/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py b/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py rename to lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/main.cpp b/lldb/test/API/functionalities/thread/crash_during_step/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/main.cpp rename to lldb/test/API/functionalities/thread/crash_during_step/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile b/lldb/test/API/functionalities/thread/create_after_attach/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile rename to lldb/test/API/functionalities/thread/create_after_attach/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py b/lldb/test/API/functionalities/thread/create_after_attach/TestCreateAfterAttach.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py rename to lldb/test/API/functionalities/thread/create_after_attach/TestCreateAfterAttach.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/main.cpp b/lldb/test/API/functionalities/thread/create_after_attach/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/main.cpp rename to lldb/test/API/functionalities/thread/create_after_attach/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile b/lldb/test/API/functionalities/thread/create_during_step/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile rename to lldb/test/API/functionalities/thread/create_during_step/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/test/API/functionalities/thread/create_during_step/TestCreateDuringStep.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py rename to lldb/test/API/functionalities/thread/create_during_step/TestCreateDuringStep.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/main.cpp b/lldb/test/API/functionalities/thread/create_during_step/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/main.cpp rename to lldb/test/API/functionalities/thread/create_during_step/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile b/lldb/test/API/functionalities/thread/exit_during_break/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile rename to lldb/test/API/functionalities/thread/exit_during_break/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py rename to lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/main.cpp b/lldb/test/API/functionalities/thread/exit_during_break/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/main.cpp rename to lldb/test/API/functionalities/thread/exit_during_break/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile b/lldb/test/API/functionalities/thread/exit_during_step/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile rename to lldb/test/API/functionalities/thread/exit_during_step/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/test/API/functionalities/thread/exit_during_step/TestExitDuringStep.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py rename to lldb/test/API/functionalities/thread/exit_during_step/TestExitDuringStep.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/main.cpp b/lldb/test/API/functionalities/thread/exit_during_step/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/main.cpp rename to lldb/test/API/functionalities/thread/exit_during_step/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile b/lldb/test/API/functionalities/thread/jump/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile rename to lldb/test/API/functionalities/thread/jump/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py b/lldb/test/API/functionalities/thread/jump/TestThreadJump.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py rename to lldb/test/API/functionalities/thread/jump/TestThreadJump.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/main.cpp b/lldb/test/API/functionalities/thread/jump/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/main.cpp rename to lldb/test/API/functionalities/thread/jump/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/other.cpp b/lldb/test/API/functionalities/thread/jump/other.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/other.cpp rename to lldb/test/API/functionalities/thread/jump/other.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile b/lldb/test/API/functionalities/thread/multi_break/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile rename to lldb/test/API/functionalities/thread/multi_break/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/test/API/functionalities/thread/multi_break/TestMultipleBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py rename to lldb/test/API/functionalities/thread/multi_break/TestMultipleBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/main.cpp b/lldb/test/API/functionalities/thread/multi_break/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/main.cpp rename to lldb/test/API/functionalities/thread/multi_break/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile b/lldb/test/API/functionalities/thread/num_threads/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile rename to lldb/test/API/functionalities/thread/num_threads/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/TestNumThreads.py b/lldb/test/API/functionalities/thread/num_threads/TestNumThreads.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/TestNumThreads.py rename to lldb/test/API/functionalities/thread/num_threads/TestNumThreads.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/main.cpp b/lldb/test/API/functionalities/thread/num_threads/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/main.cpp rename to lldb/test/API/functionalities/thread/num_threads/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile b/lldb/test/API/functionalities/thread/state/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile rename to lldb/test/API/functionalities/thread/state/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py b/lldb/test/API/functionalities/thread/state/TestThreadStates.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py rename to lldb/test/API/functionalities/thread/state/TestThreadStates.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/main.cpp b/lldb/test/API/functionalities/thread/state/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/state/main.cpp rename to lldb/test/API/functionalities/thread/state/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile b/lldb/test/API/functionalities/thread/step_out/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile rename to lldb/test/API/functionalities/thread/step_out/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py rename to lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/main.cpp b/lldb/test/API/functionalities/thread/step_out/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/main.cpp rename to lldb/test/API/functionalities/thread/step_out/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/.categories b/lldb/test/API/functionalities/thread/step_until/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/.categories rename to lldb/test/API/functionalities/thread/step_until/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile b/lldb/test/API/functionalities/thread/step_until/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile rename to lldb/test/API/functionalities/thread/step_until/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py b/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py rename to lldb/test/API/functionalities/thread/step_until/TestStepUntil.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/main.c b/lldb/test/API/functionalities/thread/step_until/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/main.c rename to lldb/test/API/functionalities/thread/step_until/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile b/lldb/test/API/functionalities/thread/thread_exit/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile rename to lldb/test/API/functionalities/thread/thread_exit/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py b/lldb/test/API/functionalities/thread/thread_exit/TestThreadExit.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py rename to lldb/test/API/functionalities/thread/thread_exit/TestThreadExit.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/main.cpp b/lldb/test/API/functionalities/thread/thread_exit/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/main.cpp rename to lldb/test/API/functionalities/thread/thread_exit/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile b/lldb/test/API/functionalities/thread/thread_specific_break/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile rename to lldb/test/API/functionalities/thread/thread_specific_break/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py b/lldb/test/API/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py rename to lldb/test/API/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/main.cpp b/lldb/test/API/functionalities/thread/thread_specific_break/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/main.cpp rename to lldb/test/API/functionalities/thread/thread_specific_break/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile b/lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile rename to lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py b/lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py rename to lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/main.cpp b/lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/main.cpp rename to lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile b/lldb/test/API/functionalities/tsan/basic/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile rename to lldb/test/API/functionalities/tsan/basic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py b/lldb/test/API/functionalities/tsan/basic/TestTsanBasic.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py rename to lldb/test/API/functionalities/tsan/basic/TestTsanBasic.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/main.c b/lldb/test/API/functionalities/tsan/basic/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/main.c rename to lldb/test/API/functionalities/tsan/basic/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile b/lldb/test/API/functionalities/tsan/cpp_global_location/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile rename to lldb/test/API/functionalities/tsan/cpp_global_location/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py b/lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py rename to lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/main.cpp b/lldb/test/API/functionalities/tsan/cpp_global_location/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/main.cpp rename to lldb/test/API/functionalities/tsan/cpp_global_location/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile b/lldb/test/API/functionalities/tsan/global_location/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile rename to lldb/test/API/functionalities/tsan/global_location/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/TestTsanGlobalLocation.py b/lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/TestTsanGlobalLocation.py rename to lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/main.c b/lldb/test/API/functionalities/tsan/global_location/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/main.c rename to lldb/test/API/functionalities/tsan/global_location/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile b/lldb/test/API/functionalities/tsan/multiple/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile rename to lldb/test/API/functionalities/tsan/multiple/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/TestTsanMultiple.py b/lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/TestTsanMultiple.py rename to lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/main.m b/lldb/test/API/functionalities/tsan/multiple/main.m rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/main.m rename to lldb/test/API/functionalities/tsan/multiple/main.m diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile b/lldb/test/API/functionalities/tsan/thread_leak/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile rename to lldb/test/API/functionalities/tsan/thread_leak/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/TestTsanThreadLeak.py b/lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/TestTsanThreadLeak.py rename to lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/main.c b/lldb/test/API/functionalities/tsan/thread_leak/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/main.c rename to lldb/test/API/functionalities/tsan/thread_leak/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile b/lldb/test/API/functionalities/tsan/thread_numbers/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile rename to lldb/test/API/functionalities/tsan/thread_numbers/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py b/lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py rename to lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/main.c b/lldb/test/API/functionalities/tsan/thread_numbers/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/main.c rename to lldb/test/API/functionalities/tsan/thread_numbers/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile b/lldb/test/API/functionalities/tty/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile rename to lldb/test/API/functionalities/tty/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py b/lldb/test/API/functionalities/tty/TestTerminal.py rename from lldb/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py rename to lldb/test/API/functionalities/tty/TestTerminal.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tty/main.c b/lldb/test/API/functionalities/tty/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/tty/main.c rename to lldb/test/API/functionalities/tty/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile b/lldb/test/API/functionalities/type_completion/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile rename to lldb/test/API/functionalities/type_completion/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py b/lldb/test/API/functionalities/type_completion/TestTypeCompletion.py rename from lldb/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py rename to lldb/test/API/functionalities/type_completion/TestTypeCompletion.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/main.cpp b/lldb/test/API/functionalities/type_completion/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/type_completion/main.cpp rename to lldb/test/API/functionalities/type_completion/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile b/lldb/test/API/functionalities/type_lookup/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile rename to lldb/test/API/functionalities/type_lookup/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py b/lldb/test/API/functionalities/type_lookup/TestTypeLookup.py rename from lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py rename to lldb/test/API/functionalities/type_lookup/TestTypeLookup.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/main.mm b/lldb/test/API/functionalities/type_lookup/main.mm rename from lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/main.mm rename to lldb/test/API/functionalities/type_lookup/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile b/lldb/test/API/functionalities/ubsan/basic/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile rename to lldb/test/API/functionalities/ubsan/basic/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/TestUbsanBasic.py b/lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py rename from lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/TestUbsanBasic.py rename to lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/main.c b/lldb/test/API/functionalities/ubsan/basic/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/main.c rename to lldb/test/API/functionalities/ubsan/basic/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile b/lldb/test/API/functionalities/ubsan/user-expression/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile rename to lldb/test/API/functionalities/ubsan/user-expression/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/TestUbsanUserExpression.py b/lldb/test/API/functionalities/ubsan/user-expression/TestUbsanUserExpression.py rename from lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/TestUbsanUserExpression.py rename to lldb/test/API/functionalities/ubsan/user-expression/TestUbsanUserExpression.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/main.c b/lldb/test/API/functionalities/ubsan/user-expression/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/main.c rename to lldb/test/API/functionalities/ubsan/user-expression/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile b/lldb/test/API/functionalities/unwind/ehframe/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile rename to lldb/test/API/functionalities/unwind/ehframe/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/TestEhFrameUnwind.py b/lldb/test/API/functionalities/unwind/ehframe/TestEhFrameUnwind.py rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/TestEhFrameUnwind.py rename to lldb/test/API/functionalities/unwind/ehframe/TestEhFrameUnwind.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/main.c b/lldb/test/API/functionalities/unwind/ehframe/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/main.c rename to lldb/test/API/functionalities/unwind/ehframe/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile b/lldb/test/API/functionalities/unwind/noreturn/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile rename to lldb/test/API/functionalities/unwind/noreturn/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py b/lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py rename to lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/main.c b/lldb/test/API/functionalities/unwind/noreturn/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/main.c rename to lldb/test/API/functionalities/unwind/noreturn/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/module-end/TestNoReturnModuleEnd.py b/lldb/test/API/functionalities/unwind/noreturn/module-end/TestNoReturnModuleEnd.py rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/module-end/TestNoReturnModuleEnd.py rename to lldb/test/API/functionalities/unwind/noreturn/module-end/TestNoReturnModuleEnd.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/module-end/a.s b/lldb/test/API/functionalities/unwind/noreturn/module-end/a.s rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/module-end/a.s rename to lldb/test/API/functionalities/unwind/noreturn/module-end/a.s diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/module-end/test.core b/lldb/test/API/functionalities/unwind/noreturn/module-end/test.core rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/module-end/test.core rename to lldb/test/API/functionalities/unwind/noreturn/module-end/test.core diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/module-end/test.out b/lldb/test/API/functionalities/unwind/noreturn/module-end/test.out rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/module-end/test.out rename to lldb/test/API/functionalities/unwind/noreturn/module-end/test.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile b/lldb/test/API/functionalities/unwind/sigtramp/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile rename to lldb/test/API/functionalities/unwind/sigtramp/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py b/lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py rename to lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/main.c b/lldb/test/API/functionalities/unwind/sigtramp/main.c rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/main.c rename to lldb/test/API/functionalities/unwind/sigtramp/main.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile b/lldb/test/API/functionalities/unwind/standard/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile rename to lldb/test/API/functionalities/unwind/standard/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py b/lldb/test/API/functionalities/unwind/standard/TestStandardUnwind.py rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py rename to lldb/test/API/functionalities/unwind/standard/TestStandardUnwind.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/divmod.cpp b/lldb/test/API/functionalities/unwind/standard/hand_written/divmod.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/divmod.cpp rename to lldb/test/API/functionalities/unwind/standard/hand_written/divmod.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/fprintf.cpp b/lldb/test/API/functionalities/unwind/standard/hand_written/fprintf.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/fprintf.cpp rename to lldb/test/API/functionalities/unwind/standard/hand_written/fprintf.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/new_delete.cpp b/lldb/test/API/functionalities/unwind/standard/hand_written/new_delete.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/new_delete.cpp rename to lldb/test/API/functionalities/unwind/standard/hand_written/new_delete.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile b/lldb/test/API/functionalities/value_md5_crash/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile rename to lldb/test/API/functionalities/value_md5_crash/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py b/lldb/test/API/functionalities/value_md5_crash/TestValueMD5Crash.py rename from lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py rename to lldb/test/API/functionalities/value_md5_crash/TestValueMD5Crash.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/main.cpp b/lldb/test/API/functionalities/value_md5_crash/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/main.cpp rename to lldb/test/API/functionalities/value_md5_crash/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile b/lldb/test/API/functionalities/var_path/Makefile rename from lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile rename to lldb/test/API/functionalities/var_path/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/var_path/TestVarPath.py b/lldb/test/API/functionalities/var_path/TestVarPath.py rename from lldb/packages/Python/lldbsuite/test/functionalities/var_path/TestVarPath.py rename to lldb/test/API/functionalities/var_path/TestVarPath.py diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/var_path/main.cpp b/lldb/test/API/functionalities/var_path/main.cpp rename from lldb/packages/Python/lldbsuite/test/functionalities/var_path/main.cpp rename to lldb/test/API/functionalities/var_path/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/wrong_commands/.categories b/lldb/test/API/functionalities/wrong_commands/.categories rename from lldb/packages/Python/lldbsuite/test/functionalities/wrong_commands/.categories rename to lldb/test/API/functionalities/wrong_commands/.categories diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/wrong_commands/TestWrongCommands.py b/lldb/test/API/functionalities/wrong_commands/TestWrongCommands.py rename from lldb/packages/Python/lldbsuite/test/functionalities/wrong_commands/TestWrongCommands.py rename to lldb/test/API/functionalities/wrong_commands/TestWrongCommands.py diff --git a/lldb/packages/Python/lldbsuite/test/iohandler/completion/TestIOHandlerCompletion.py b/lldb/test/API/iohandler/completion/TestIOHandlerCompletion.py rename from lldb/packages/Python/lldbsuite/test/iohandler/completion/TestIOHandlerCompletion.py rename to lldb/test/API/iohandler/completion/TestIOHandlerCompletion.py diff --git a/lldb/packages/Python/lldbsuite/test/iohandler/completion/main.c b/lldb/test/API/iohandler/completion/main.c rename from lldb/packages/Python/lldbsuite/test/iohandler/completion/main.c rename to lldb/test/API/iohandler/completion/main.c diff --git a/lldb/packages/Python/lldbsuite/test/iohandler/unicode/TestUnicode.py b/lldb/test/API/iohandler/unicode/TestUnicode.py rename from lldb/packages/Python/lldbsuite/test/iohandler/unicode/TestUnicode.py rename to lldb/test/API/iohandler/unicode/TestUnicode.py diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/README.txt b/lldb/test/API/issue_verification/README.txt rename from lldb/packages/Python/lldbsuite/test/issue_verification/README.txt rename to lldb/test/API/issue_verification/README.txt diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestExpectedTimeout.py.park b/lldb/test/API/issue_verification/TestExpectedTimeout.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestExpectedTimeout.py.park rename to lldb/test/API/issue_verification/TestExpectedTimeout.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestFail.py.park b/lldb/test/API/issue_verification/TestFail.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestFail.py.park rename to lldb/test/API/issue_verification/TestFail.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestInvalidDecorator.py.park b/lldb/test/API/issue_verification/TestInvalidDecorator.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestInvalidDecorator.py.park rename to lldb/test/API/issue_verification/TestInvalidDecorator.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestRerunFail.py.park b/lldb/test/API/issue_verification/TestRerunFail.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestRerunFail.py.park rename to lldb/test/API/issue_verification/TestRerunFail.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestRerunFileLevelTimeout.py.park b/lldb/test/API/issue_verification/TestRerunFileLevelTimeout.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestRerunFileLevelTimeout.py.park rename to lldb/test/API/issue_verification/TestRerunFileLevelTimeout.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestRerunInline.py.park b/lldb/test/API/issue_verification/TestRerunInline.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestRerunInline.py.park rename to lldb/test/API/issue_verification/TestRerunInline.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestRerunTimeout.py.park b/lldb/test/API/issue_verification/TestRerunTimeout.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestRerunTimeout.py.park rename to lldb/test/API/issue_verification/TestRerunTimeout.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestSignal.py.park b/lldb/test/API/issue_verification/TestSignal.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestSignal.py.park rename to lldb/test/API/issue_verification/TestSignal.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestSignalOutsideTestMethod.py.park b/lldb/test/API/issue_verification/TestSignalOutsideTestMethod.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestSignalOutsideTestMethod.py.park rename to lldb/test/API/issue_verification/TestSignalOutsideTestMethod.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/TestTimeout.py.park b/lldb/test/API/issue_verification/TestTimeout.py.park rename from lldb/packages/Python/lldbsuite/test/issue_verification/TestTimeout.py.park rename to lldb/test/API/issue_verification/TestTimeout.py.park diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/disable.py b/lldb/test/API/issue_verification/disable.py rename from lldb/packages/Python/lldbsuite/test/issue_verification/disable.py rename to lldb/test/API/issue_verification/disable.py diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/enable.py b/lldb/test/API/issue_verification/enable.py rename from lldb/packages/Python/lldbsuite/test/issue_verification/enable.py rename to lldb/test/API/issue_verification/enable.py diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/inline_rerun_inferior.cpp b/lldb/test/API/issue_verification/inline_rerun_inferior.cpp rename from lldb/packages/Python/lldbsuite/test/issue_verification/inline_rerun_inferior.cpp rename to lldb/test/API/issue_verification/inline_rerun_inferior.cpp diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/rerun_base.py b/lldb/test/API/issue_verification/rerun_base.py rename from lldb/packages/Python/lldbsuite/test/issue_verification/rerun_base.py rename to lldb/test/API/issue_verification/rerun_base.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile b/lldb/test/API/lang/c/anonymous/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile rename to lldb/test/API/lang/c/anonymous/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py b/lldb/test/API/lang/c/anonymous/TestAnonymous.py rename from lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py rename to lldb/test/API/lang/c/anonymous/TestAnonymous.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/main.c b/lldb/test/API/lang/c/anonymous/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/anonymous/main.c rename to lldb/test/API/lang/c/anonymous/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile b/lldb/test/API/lang/c/array_types/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile rename to lldb/test/API/lang/c/array_types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py b/lldb/test/API/lang/c/array_types/TestArrayTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py rename to lldb/test/API/lang/c/array_types/TestArrayTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/cmds.txt b/lldb/test/API/lang/c/array_types/cmds.txt rename from lldb/packages/Python/lldbsuite/test/lang/c/array_types/cmds.txt rename to lldb/test/API/lang/c/array_types/cmds.txt diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/main.c b/lldb/test/API/lang/c/array_types/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/array_types/main.c rename to lldb/test/API/lang/c/array_types/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile b/lldb/test/API/lang/c/bitfields/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile rename to lldb/test/API/lang/c/bitfields/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py b/lldb/test/API/lang/c/bitfields/TestBitfields.py rename from lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py rename to lldb/test/API/lang/c/bitfields/TestBitfields.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/main.c b/lldb/test/API/lang/c/bitfields/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/bitfields/main.c rename to lldb/test/API/lang/c/bitfields/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile b/lldb/test/API/lang/c/blocks/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile rename to lldb/test/API/lang/c/blocks/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py b/lldb/test/API/lang/c/blocks/TestBlocks.py rename from lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py rename to lldb/test/API/lang/c/blocks/TestBlocks.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/main.c b/lldb/test/API/lang/c/blocks/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/blocks/main.c rename to lldb/test/API/lang/c/blocks/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile b/lldb/test/API/lang/c/conflicting-symbol/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile rename to lldb/test/API/lang/c/conflicting-symbol/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk b/lldb/test/API/lang/c/conflicting-symbol/One.mk rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk rename to lldb/test/API/lang/c/conflicting-symbol/One.mk diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One/One.h b/lldb/test/API/lang/c/conflicting-symbol/One/One.h rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One/One.h rename to lldb/test/API/lang/c/conflicting-symbol/One/One.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One/One.c b/lldb/test/API/lang/c/conflicting-symbol/One/One.c rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One/One.c rename to lldb/test/API/lang/c/conflicting-symbol/One/One.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One/OneConstant.c b/lldb/test/API/lang/c/conflicting-symbol/One/OneConstant.c rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One/OneConstant.c rename to lldb/test/API/lang/c/conflicting-symbol/One/OneConstant.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py b/lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py rename to lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk b/lldb/test/API/lang/c/conflicting-symbol/Two.mk rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk rename to lldb/test/API/lang/c/conflicting-symbol/Two.mk diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two/Two.h b/lldb/test/API/lang/c/conflicting-symbol/Two/Two.h rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two/Two.h rename to lldb/test/API/lang/c/conflicting-symbol/Two/Two.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two/Two.c b/lldb/test/API/lang/c/conflicting-symbol/Two/Two.c rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two/Two.c rename to lldb/test/API/lang/c/conflicting-symbol/Two/Two.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two/TwoConstant.c b/lldb/test/API/lang/c/conflicting-symbol/Two/TwoConstant.c rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two/TwoConstant.c rename to lldb/test/API/lang/c/conflicting-symbol/Two/TwoConstant.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/main.c b/lldb/test/API/lang/c/conflicting-symbol/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/main.c rename to lldb/test/API/lang/c/conflicting-symbol/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile b/lldb/test/API/lang/c/const_variables/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile rename to lldb/test/API/lang/c/const_variables/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py b/lldb/test/API/lang/c/const_variables/TestConstVariables.py rename from lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py rename to lldb/test/API/lang/c/const_variables/TestConstVariables.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/functions.c b/lldb/test/API/lang/c/const_variables/functions.c rename from lldb/packages/Python/lldbsuite/test/lang/c/const_variables/functions.c rename to lldb/test/API/lang/c/const_variables/functions.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/main.c b/lldb/test/API/lang/c/const_variables/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/const_variables/main.c rename to lldb/test/API/lang/c/const_variables/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile b/lldb/test/API/lang/c/enum_types/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile rename to lldb/test/API/lang/c/enum_types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py b/lldb/test/API/lang/c/enum_types/TestEnumTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py rename to lldb/test/API/lang/c/enum_types/TestEnumTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/main.c b/lldb/test/API/lang/c/enum_types/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/enum_types/main.c rename to lldb/test/API/lang/c/enum_types/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile b/lldb/test/API/lang/c/find_struct_type/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile rename to lldb/test/API/lang/c/find_struct_type/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/TestFindStructTypes.py b/lldb/test/API/lang/c/find_struct_type/TestFindStructTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/TestFindStructTypes.py rename to lldb/test/API/lang/c/find_struct_type/TestFindStructTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/main.c b/lldb/test/API/lang/c/find_struct_type/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/main.c rename to lldb/test/API/lang/c/find_struct_type/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile b/lldb/test/API/lang/c/forward/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile rename to lldb/test/API/lang/c/forward/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/README.txt b/lldb/test/API/lang/c/forward/README.txt rename from lldb/packages/Python/lldbsuite/test/lang/c/forward/README.txt rename to lldb/test/API/lang/c/forward/README.txt diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py b/lldb/test/API/lang/c/forward/TestForwardDeclaration.py rename from lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py rename to lldb/test/API/lang/c/forward/TestForwardDeclaration.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/foo.h b/lldb/test/API/lang/c/forward/foo.h rename from lldb/packages/Python/lldbsuite/test/lang/c/forward/foo.h rename to lldb/test/API/lang/c/forward/foo.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/foo.c b/lldb/test/API/lang/c/forward/foo.c rename from lldb/packages/Python/lldbsuite/test/lang/c/forward/foo.c rename to lldb/test/API/lang/c/forward/foo.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/main.c b/lldb/test/API/lang/c/forward/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/forward/main.c rename to lldb/test/API/lang/c/forward/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile b/lldb/test/API/lang/c/function_types/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile rename to lldb/test/API/lang/c/function_types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py b/lldb/test/API/lang/c/function_types/TestFunctionTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py rename to lldb/test/API/lang/c/function_types/TestFunctionTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/main.c b/lldb/test/API/lang/c/function_types/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/function_types/main.c rename to lldb/test/API/lang/c/function_types/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile b/lldb/test/API/lang/c/global_variables/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile rename to lldb/test/API/lang/c/global_variables/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/test/API/lang/c/global_variables/TestGlobalVariables.py rename from lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py rename to lldb/test/API/lang/c/global_variables/TestGlobalVariables.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/a.c b/lldb/test/API/lang/c/global_variables/a.c rename from lldb/packages/Python/lldbsuite/test/lang/c/global_variables/a.c rename to lldb/test/API/lang/c/global_variables/a.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/cmds.txt b/lldb/test/API/lang/c/global_variables/cmds.txt rename from lldb/packages/Python/lldbsuite/test/lang/c/global_variables/cmds.txt rename to lldb/test/API/lang/c/global_variables/cmds.txt diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/main.c b/lldb/test/API/lang/c/global_variables/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/global_variables/main.c rename to lldb/test/API/lang/c/global_variables/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/inlines/TestRedefinitionsInInlines.py b/lldb/test/API/lang/c/inlines/TestRedefinitionsInInlines.py rename from lldb/packages/Python/lldbsuite/test/lang/c/inlines/TestRedefinitionsInInlines.py rename to lldb/test/API/lang/c/inlines/TestRedefinitionsInInlines.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/inlines/main.c b/lldb/test/API/lang/c/inlines/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/inlines/main.c rename to lldb/test/API/lang/c/inlines/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_types/TestUseClosestType.py b/lldb/test/API/lang/c/local_types/TestUseClosestType.py rename from lldb/packages/Python/lldbsuite/test/lang/c/local_types/TestUseClosestType.py rename to lldb/test/API/lang/c/local_types/TestUseClosestType.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_types/main.c b/lldb/test/API/lang/c/local_types/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/local_types/main.c rename to lldb/test/API/lang/c/local_types/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_types/other.c b/lldb/test/API/lang/c/local_types/other.c rename from lldb/packages/Python/lldbsuite/test/lang/c/local_types/other.c rename to lldb/test/API/lang/c/local_types/other.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile b/lldb/test/API/lang/c/local_variables/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile rename to lldb/test/API/lang/c/local_variables/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/TestLocalVariables.py b/lldb/test/API/lang/c/local_variables/TestLocalVariables.py rename from lldb/packages/Python/lldbsuite/test/lang/c/local_variables/TestLocalVariables.py rename to lldb/test/API/lang/c/local_variables/TestLocalVariables.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/main.c b/lldb/test/API/lang/c/local_variables/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/local_variables/main.c rename to lldb/test/API/lang/c/local_variables/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile b/lldb/test/API/lang/c/modules/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile rename to lldb/test/API/lang/c/modules/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py b/lldb/test/API/lang/c/modules/TestCModules.py rename from lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py rename to lldb/test/API/lang/c/modules/TestCModules.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/modules/main.c b/lldb/test/API/lang/c/modules/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/modules/main.c rename to lldb/test/API/lang/c/modules/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/TestOffsetof.py b/lldb/test/API/lang/c/offsetof/TestOffsetof.py rename from lldb/packages/Python/lldbsuite/test/lang/c/offsetof/TestOffsetof.py rename to lldb/test/API/lang/c/offsetof/TestOffsetof.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/main.c b/lldb/test/API/lang/c/offsetof/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/offsetof/main.c rename to lldb/test/API/lang/c/offsetof/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile b/lldb/test/API/lang/c/recurse/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile rename to lldb/test/API/lang/c/recurse/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/recurse/main.c b/lldb/test/API/lang/c/recurse/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/recurse/main.c rename to lldb/test/API/lang/c/recurse/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile b/lldb/test/API/lang/c/register_variables/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile rename to lldb/test/API/lang/c/register_variables/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py b/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py rename from lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py rename to lldb/test/API/lang/c/register_variables/TestRegisterVariables.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/test.c b/lldb/test/API/lang/c/register_variables/test.c rename from lldb/packages/Python/lldbsuite/test/lang/c/register_variables/test.c rename to lldb/test/API/lang/c/register_variables/test.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile b/lldb/test/API/lang/c/set_values/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile rename to lldb/test/API/lang/c/set_values/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py b/lldb/test/API/lang/c/set_values/TestSetValues.py rename from lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py rename to lldb/test/API/lang/c/set_values/TestSetValues.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/main.c b/lldb/test/API/lang/c/set_values/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/set_values/main.c rename to lldb/test/API/lang/c/set_values/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile b/lldb/test/API/lang/c/shared_lib/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile rename to lldb/test/API/lang/c/shared_lib/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py b/lldb/test/API/lang/c/shared_lib/TestSharedLib.py rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py rename to lldb/test/API/lang/c/shared_lib/TestSharedLib.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/foo.h b/lldb/test/API/lang/c/shared_lib/foo.h rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/foo.h rename to lldb/test/API/lang/c/shared_lib/foo.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/foo.c b/lldb/test/API/lang/c/shared_lib/foo.c rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/foo.c rename to lldb/test/API/lang/c/shared_lib/foo.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/main.c b/lldb/test/API/lang/c/shared_lib/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/main.c rename to lldb/test/API/lang/c/shared_lib/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile b/lldb/test/API/lang/c/shared_lib_stripped_symbols/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile rename to lldb/test/API/lang/c/shared_lib_stripped_symbols/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py rename to lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/foo.h b/lldb/test/API/lang/c/shared_lib_stripped_symbols/foo.h rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/foo.h rename to lldb/test/API/lang/c/shared_lib_stripped_symbols/foo.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/foo.c b/lldb/test/API/lang/c/shared_lib_stripped_symbols/foo.c rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/foo.c rename to lldb/test/API/lang/c/shared_lib_stripped_symbols/foo.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/main.c b/lldb/test/API/lang/c/shared_lib_stripped_symbols/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/main.c rename to lldb/test/API/lang/c/shared_lib_stripped_symbols/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/.categories b/lldb/test/API/lang/c/step-target/.categories rename from lldb/packages/Python/lldbsuite/test/lang/c/step-target/.categories rename to lldb/test/API/lang/c/step-target/.categories diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile b/lldb/test/API/lang/c/step-target/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile rename to lldb/test/API/lang/c/step-target/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/TestStepTarget.py b/lldb/test/API/lang/c/step-target/TestStepTarget.py rename from lldb/packages/Python/lldbsuite/test/lang/c/step-target/TestStepTarget.py rename to lldb/test/API/lang/c/step-target/TestStepTarget.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/main.c b/lldb/test/API/lang/c/step-target/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/step-target/main.c rename to lldb/test/API/lang/c/step-target/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step_over_no_deadlock/Makefile b/lldb/test/API/lang/c/step_over_no_deadlock/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/step_over_no_deadlock/Makefile rename to lldb/test/API/lang/c/step_over_no_deadlock/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py b/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py rename from lldb/packages/Python/lldbsuite/test/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py rename to lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step_over_no_deadlock/locking.cpp b/lldb/test/API/lang/c/step_over_no_deadlock/locking.cpp rename from lldb/packages/Python/lldbsuite/test/lang/c/step_over_no_deadlock/locking.cpp rename to lldb/test/API/lang/c/step_over_no_deadlock/locking.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile b/lldb/test/API/lang/c/stepping/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile rename to lldb/test/API/lang/c/stepping/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/test/API/lang/c/stepping/TestStepAndBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py rename to lldb/test/API/lang/c/stepping/TestStepAndBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py b/lldb/test/API/lang/c/stepping/TestThreadStepping.py rename from lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py rename to lldb/test/API/lang/c/stepping/TestThreadStepping.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/main.c b/lldb/test/API/lang/c/stepping/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/stepping/main.c rename to lldb/test/API/lang/c/stepping/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile b/lldb/test/API/lang/c/strings/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile rename to lldb/test/API/lang/c/strings/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py b/lldb/test/API/lang/c/strings/TestCStrings.py rename from lldb/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py rename to lldb/test/API/lang/c/strings/TestCStrings.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/strings/main.c b/lldb/test/API/lang/c/strings/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/strings/main.c rename to lldb/test/API/lang/c/strings/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py b/lldb/test/API/lang/c/struct_types/TestStructTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py rename to lldb/test/API/lang/c/struct_types/TestStructTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/main.c b/lldb/test/API/lang/c/struct_types/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/struct_types/main.c rename to lldb/test/API/lang/c/struct_types/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile b/lldb/test/API/lang/c/tls_globals/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile rename to lldb/test/API/lang/c/tls_globals/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/test/API/lang/c/tls_globals/TestTlsGlobals.py rename from lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py rename to lldb/test/API/lang/c/tls_globals/TestTlsGlobals.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/a.c b/lldb/test/API/lang/c/tls_globals/a.c rename from lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/a.c rename to lldb/test/API/lang/c/tls_globals/a.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/main.c b/lldb/test/API/lang/c/tls_globals/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/main.c rename to lldb/test/API/lang/c/tls_globals/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile b/lldb/test/API/lang/c/typedef/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile rename to lldb/test/API/lang/c/typedef/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py b/lldb/test/API/lang/c/typedef/Testtypedef.py rename from lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py rename to lldb/test/API/lang/c/typedef/Testtypedef.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/main.c b/lldb/test/API/lang/c/typedef/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/typedef/main.c rename to lldb/test/API/lang/c/typedef/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile b/lldb/test/API/lang/c/unicode/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile rename to lldb/test/API/lang/c/unicode/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unicode/TestUnicodeSymbols.py b/lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py rename from lldb/packages/Python/lldbsuite/test/lang/c/unicode/TestUnicodeSymbols.py rename to lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unicode/main.c b/lldb/test/API/lang/c/unicode/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/unicode/main.c rename to lldb/test/API/lang/c/unicode/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile b/lldb/test/API/lang/c/unions/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile rename to lldb/test/API/lang/c/unions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unions/TestUnionMembers.py b/lldb/test/API/lang/c/unions/TestUnionMembers.py rename from lldb/packages/Python/lldbsuite/test/lang/c/unions/TestUnionMembers.py rename to lldb/test/API/lang/c/unions/TestUnionMembers.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unions/main.c b/lldb/test/API/lang/c/unions/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/unions/main.c rename to lldb/test/API/lang/c/unions/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile b/lldb/test/API/lang/c/vla/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile rename to lldb/test/API/lang/c/vla/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/vla/TestVLA.py b/lldb/test/API/lang/c/vla/TestVLA.py rename from lldb/packages/Python/lldbsuite/test/lang/c/vla/TestVLA.py rename to lldb/test/API/lang/c/vla/TestVLA.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/vla/main.c b/lldb/test/API/lang/c/vla/main.c rename from lldb/packages/Python/lldbsuite/test/lang/c/vla/main.c rename to lldb/test/API/lang/c/vla/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/Makefile b/lldb/test/API/lang/cpp/accelerator-table/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/Makefile rename to lldb/test/API/lang/cpp/accelerator-table/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/TestCPPAccelerator.py b/lldb/test/API/lang/cpp/accelerator-table/TestCPPAccelerator.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/TestCPPAccelerator.py rename to lldb/test/API/lang/cpp/accelerator-table/TestCPPAccelerator.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/a.cpp b/lldb/test/API/lang/cpp/accelerator-table/a.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/a.cpp rename to lldb/test/API/lang/cpp/accelerator-table/a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/b.cpp b/lldb/test/API/lang/cpp/accelerator-table/b.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/b.cpp rename to lldb/test/API/lang/cpp/accelerator-table/b.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/c.cpp b/lldb/test/API/lang/cpp/accelerator-table/c.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/c.cpp rename to lldb/test/API/lang/cpp/accelerator-table/c.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/d.cpp b/lldb/test/API/lang/cpp/accelerator-table/d.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/d.cpp rename to lldb/test/API/lang/cpp/accelerator-table/d.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/e.cpp b/lldb/test/API/lang/cpp/accelerator-table/e.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/e.cpp rename to lldb/test/API/lang/cpp/accelerator-table/e.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/f.cpp b/lldb/test/API/lang/cpp/accelerator-table/f.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/f.cpp rename to lldb/test/API/lang/cpp/accelerator-table/f.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/g.cpp b/lldb/test/API/lang/cpp/accelerator-table/g.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/g.cpp rename to lldb/test/API/lang/cpp/accelerator-table/g.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/main.cpp b/lldb/test/API/lang/cpp/accelerator-table/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/main.cpp rename to lldb/test/API/lang/cpp/accelerator-table/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/source.h b/lldb/test/API/lang/cpp/accelerator-table/source.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/accelerator-table/source.h rename to lldb/test/API/lang/cpp/accelerator-table/source.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile b/lldb/test/API/lang/cpp/auto/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile rename to lldb/test/API/lang/cpp/auto/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/TestCPPAuto.py b/lldb/test/API/lang/cpp/auto/TestCPPAuto.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/auto/TestCPPAuto.py rename to lldb/test/API/lang/cpp/auto/TestCPPAuto.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp b/lldb/test/API/lang/cpp/auto/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp rename to lldb/test/API/lang/cpp/auto/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/bitfields/Makefile b/lldb/test/API/lang/cpp/bitfields/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/bitfields/Makefile rename to lldb/test/API/lang/cpp/bitfields/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/bitfields/TestCppBitfields.py b/lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/bitfields/TestCppBitfields.py rename to lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/bitfields/main.cpp b/lldb/test/API/lang/cpp/bitfields/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/bitfields/main.cpp rename to lldb/test/API/lang/cpp/bitfields/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile b/lldb/test/API/lang/cpp/bool/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile rename to lldb/test/API/lang/cpp/bool/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py b/lldb/test/API/lang/cpp/bool/TestCPPBool.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py rename to lldb/test/API/lang/cpp/bool/TestCPPBool.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/main.cpp b/lldb/test/API/lang/cpp/bool/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/bool/main.cpp rename to lldb/test/API/lang/cpp/bool/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile b/lldb/test/API/lang/cpp/breakpoint-commands/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile rename to lldb/test/API/lang/cpp/breakpoint-commands/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py b/lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py rename to lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/nested.cpp b/lldb/test/API/lang/cpp/breakpoint-commands/nested.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/nested.cpp rename to lldb/test/API/lang/cpp/breakpoint-commands/nested.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile b/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile rename to lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py b/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py rename to lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/a.h b/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/a.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/a.h rename to lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/a.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/a.cpp b/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/a.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/a.cpp rename to lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/main.cpp b/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/main.cpp rename to lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/module.modulemap b/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/module.modulemap rename from lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/module.modulemap rename to lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/module.modulemap diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile b/lldb/test/API/lang/cpp/call-function/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile rename to lldb/test/API/lang/cpp/call-function/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py b/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py rename to lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/main.cpp b/lldb/test/API/lang/cpp/call-function/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/main.cpp rename to lldb/test/API/lang/cpp/call-function/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile b/lldb/test/API/lang/cpp/chained-calls/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile rename to lldb/test/API/lang/cpp/chained-calls/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py b/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py rename to lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/main.cpp b/lldb/test/API/lang/cpp/chained-calls/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/main.cpp rename to lldb/test/API/lang/cpp/chained-calls/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/.categories b/lldb/test/API/lang/cpp/char1632_t/.categories rename from lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/.categories rename to lldb/test/API/lang/cpp/char1632_t/.categories diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile b/lldb/test/API/lang/cpp/char1632_t/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile rename to lldb/test/API/lang/cpp/char1632_t/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py b/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py rename to lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/main.cpp b/lldb/test/API/lang/cpp/char1632_t/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/main.cpp rename to lldb/test/API/lang/cpp/char1632_t/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile b/lldb/test/API/lang/cpp/char8_t/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile rename to lldb/test/API/lang/cpp/char8_t/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/TestCxxChar8_t.py b/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/TestCxxChar8_t.py rename to lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/main.cpp b/lldb/test/API/lang/cpp/char8_t/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/main.cpp rename to lldb/test/API/lang/cpp/char8_t/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py b/lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py rename to lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp b/lldb/test/API/lang/cpp/class-template-parameter-pack/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp rename to lldb/test/API/lang/cpp/class-template-parameter-pack/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile b/lldb/test/API/lang/cpp/class_static/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile rename to lldb/test/API/lang/cpp/class_static/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py rename to lldb/test/API/lang/cpp/class_static/TestStaticVariables.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/main.cpp b/lldb/test/API/lang/cpp/class_static/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/main.cpp rename to lldb/test/API/lang/cpp/class_static/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile b/lldb/test/API/lang/cpp/class_types/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile rename to lldb/test/API/lang/cpp/class_types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py b/lldb/test/API/lang/cpp/class_types/TestClassTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py rename to lldb/test/API/lang/cpp/class_types/TestClassTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py rename to lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/cmds.txt b/lldb/test/API/lang/cpp/class_types/cmds.txt rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/cmds.txt rename to lldb/test/API/lang/cpp/class_types/cmds.txt diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp b/lldb/test/API/lang/cpp/class_types/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp rename to lldb/test/API/lang/cpp/class_types/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/TestConstThis.py b/lldb/test/API/lang/cpp/const_this/TestConstThis.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/TestConstThis.py rename to lldb/test/API/lang/cpp/const_this/TestConstThis.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/main.cpp b/lldb/test/API/lang/cpp/const_this/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/main.cpp rename to lldb/test/API/lang/cpp/const_this/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/constructors/Makefile b/lldb/test/API/lang/cpp/constructors/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/constructors/Makefile rename to lldb/test/API/lang/cpp/constructors/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/constructors/TestCppConstructors.py b/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/constructors/TestCppConstructors.py rename to lldb/test/API/lang/cpp/constructors/TestCppConstructors.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/constructors/main.cpp b/lldb/test/API/lang/cpp/constructors/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/constructors/main.cpp rename to lldb/test/API/lang/cpp/constructors/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/covariant-return-types/Makefile b/lldb/test/API/lang/cpp/covariant-return-types/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/covariant-return-types/Makefile rename to lldb/test/API/lang/cpp/covariant-return-types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/covariant-return-types/TestCovariantReturnTypes.py b/lldb/test/API/lang/cpp/covariant-return-types/TestCovariantReturnTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/covariant-return-types/TestCovariantReturnTypes.py rename to lldb/test/API/lang/cpp/covariant-return-types/TestCovariantReturnTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/covariant-return-types/main.cpp b/lldb/test/API/lang/cpp/covariant-return-types/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/covariant-return-types/main.cpp rename to lldb/test/API/lang/cpp/covariant-return-types/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile b/lldb/test/API/lang/cpp/diamond/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile rename to lldb/test/API/lang/cpp/diamond/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py b/lldb/test/API/lang/cpp/diamond/TestDiamond.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py rename to lldb/test/API/lang/cpp/diamond/TestDiamond.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp b/lldb/test/API/lang/cpp/diamond/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp rename to lldb/test/API/lang/cpp/diamond/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/dynamic-value-same-basename/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/dynamic-value-same-basename/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py b/lldb/test/API/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py rename to lldb/test/API/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/main.cpp b/lldb/test/API/lang/cpp/dynamic-value-same-basename/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/main.cpp rename to lldb/test/API/lang/cpp/dynamic-value-same-basename/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile b/lldb/test/API/lang/cpp/dynamic-value/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile rename to lldb/test/API/lang/cpp/dynamic-value/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py rename to lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py b/lldb/test/API/lang/cpp/dynamic-value/TestDynamicValue.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py rename to lldb/test/API/lang/cpp/dynamic-value/TestDynamicValue.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/pass-to-base.cpp b/lldb/test/API/lang/cpp/dynamic-value/pass-to-base.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/pass-to-base.cpp rename to lldb/test/API/lang/cpp/dynamic-value/pass-to-base.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/sbvalue-cast.cpp b/lldb/test/API/lang/cpp/dynamic-value/sbvalue-cast.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/sbvalue-cast.cpp rename to lldb/test/API/lang/cpp/dynamic-value/sbvalue-cast.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile b/lldb/test/API/lang/cpp/enum_types/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile rename to lldb/test/API/lang/cpp/enum_types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py rename to lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/main.cpp b/lldb/test/API/lang/cpp/enum_types/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/main.cpp rename to lldb/test/API/lang/cpp/enum_types/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile b/lldb/test/API/lang/cpp/exceptions/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile rename to lldb/test/API/lang/cpp/exceptions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/test/API/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py rename to lldb/test/API/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/exceptions.cpp b/lldb/test/API/lang/cpp/exceptions/exceptions.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/exceptions.cpp rename to lldb/test/API/lang/cpp/exceptions/exceptions.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/TestExternCSymbols.py b/lldb/test/API/lang/cpp/extern_c/TestExternCSymbols.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/TestExternCSymbols.py rename to lldb/test/API/lang/cpp/extern_c/TestExternCSymbols.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/main.cpp b/lldb/test/API/lang/cpp/extern_c/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/main.cpp rename to lldb/test/API/lang/cpp/extern_c/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/frame-var-anon-unions/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/frame-var-anon-unions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py b/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py rename to lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/main.cpp b/lldb/test/API/lang/cpp/frame-var-anon-unions/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/main.cpp rename to lldb/test/API/lang/cpp/frame-var-anon-unions/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/function-qualifiers/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/function-qualifiers/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py b/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py rename to lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-qualifiers/main.cpp b/lldb/test/API/lang/cpp/function-qualifiers/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/function-qualifiers/main.cpp rename to lldb/test/API/lang/cpp/function-qualifiers/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/TestFunctionTemplateParameterPack.py b/lldb/test/API/lang/cpp/function-template-parameter-pack/TestFunctionTemplateParameterPack.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/TestFunctionTemplateParameterPack.py rename to lldb/test/API/lang/cpp/function-template-parameter-pack/TestFunctionTemplateParameterPack.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/main.cpp b/lldb/test/API/lang/cpp/function-template-parameter-pack/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/main.cpp rename to lldb/test/API/lang/cpp/function-template-parameter-pack/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/TestFunctionRefs.py b/lldb/test/API/lang/cpp/function_refs/TestFunctionRefs.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/TestFunctionRefs.py rename to lldb/test/API/lang/cpp/function_refs/TestFunctionRefs.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/main.cpp b/lldb/test/API/lang/cpp/function_refs/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/main.cpp rename to lldb/test/API/lang/cpp/function_refs/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/global_operators/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/global_operators/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py b/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py rename to lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/main.cpp b/lldb/test/API/lang/cpp/global_operators/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/main.cpp rename to lldb/test/API/lang/cpp/global_operators/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/global_variables/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/global_variables/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py b/lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py rename to lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/main.cpp b/lldb/test/API/lang/cpp/global_variables/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/main.cpp rename to lldb/test/API/lang/cpp/global_variables/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/TestGModules.py b/lldb/test/API/lang/cpp/gmodules-templates/TestGModules.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/TestGModules.py rename to lldb/test/API/lang/cpp/gmodules-templates/TestGModules.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/a.h b/lldb/test/API/lang/cpp/gmodules-templates/a.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/a.h rename to lldb/test/API/lang/cpp/gmodules-templates/a.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/b.h b/lldb/test/API/lang/cpp/gmodules-templates/b.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/b.h rename to lldb/test/API/lang/cpp/gmodules-templates/b.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/main.cpp b/lldb/test/API/lang/cpp/gmodules-templates/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/main.cpp rename to lldb/test/API/lang/cpp/gmodules-templates/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/memory.h b/lldb/test/API/lang/cpp/gmodules-templates/memory.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/memory.h rename to lldb/test/API/lang/cpp/gmodules-templates/memory.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/module.modulemap b/lldb/test/API/lang/cpp/gmodules-templates/module.modulemap rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/module.modulemap rename to lldb/test/API/lang/cpp/gmodules-templates/module.modulemap diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile b/lldb/test/API/lang/cpp/gmodules/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile rename to lldb/test/API/lang/cpp/gmodules/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/TestWithModuleDebugging.py b/lldb/test/API/lang/cpp/gmodules/TestWithModuleDebugging.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/TestWithModuleDebugging.py rename to lldb/test/API/lang/cpp/gmodules/TestWithModuleDebugging.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/main.cpp b/lldb/test/API/lang/cpp/gmodules/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/main.cpp rename to lldb/test/API/lang/cpp/gmodules/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/pch.h b/lldb/test/API/lang/cpp/gmodules/pch.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/pch.h rename to lldb/test/API/lang/cpp/gmodules/pch.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile b/lldb/test/API/lang/cpp/incomplete-types/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile rename to lldb/test/API/lang/cpp/incomplete-types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py b/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py rename to lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/a.h b/lldb/test/API/lang/cpp/incomplete-types/a.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/a.h rename to lldb/test/API/lang/cpp/incomplete-types/a.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/a.cpp b/lldb/test/API/lang/cpp/incomplete-types/a.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/a.cpp rename to lldb/test/API/lang/cpp/incomplete-types/a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/length.h b/lldb/test/API/lang/cpp/incomplete-types/length.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/length.h rename to lldb/test/API/lang/cpp/incomplete-types/length.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/length.cpp b/lldb/test/API/lang/cpp/incomplete-types/length.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/length.cpp rename to lldb/test/API/lang/cpp/incomplete-types/length.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/main.cpp b/lldb/test/API/lang/cpp/incomplete-types/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/main.cpp rename to lldb/test/API/lang/cpp/incomplete-types/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile b/lldb/test/API/lang/cpp/inlines/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile rename to lldb/test/API/lang/cpp/inlines/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/TestInlines.py b/lldb/test/API/lang/cpp/inlines/TestInlines.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/TestInlines.py rename to lldb/test/API/lang/cpp/inlines/TestInlines.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/inlines.h b/lldb/test/API/lang/cpp/inlines/inlines.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/inlines.h rename to lldb/test/API/lang/cpp/inlines/inlines.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/inlines.cpp b/lldb/test/API/lang/cpp/inlines/inlines.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/inlines.cpp rename to lldb/test/API/lang/cpp/inlines/inlines.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/lambdas/TestLambdas.py b/lldb/test/API/lang/cpp/lambdas/TestLambdas.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/lambdas/TestLambdas.py rename to lldb/test/API/lang/cpp/lambdas/TestLambdas.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/lambdas/main.cpp b/lldb/test/API/lang/cpp/lambdas/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/lambdas/main.cpp rename to lldb/test/API/lang/cpp/lambdas/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile b/lldb/test/API/lang/cpp/limit-debug-info/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile rename to lldb/test/API/lang/cpp/limit-debug-info/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py b/lldb/test/API/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py rename to lldb/test/API/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/base.h b/lldb/test/API/lang/cpp/limit-debug-info/base.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/base.h rename to lldb/test/API/lang/cpp/limit-debug-info/base.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/base.cpp b/lldb/test/API/lang/cpp/limit-debug-info/base.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/base.cpp rename to lldb/test/API/lang/cpp/limit-debug-info/base.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/derived.h b/lldb/test/API/lang/cpp/limit-debug-info/derived.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/derived.h rename to lldb/test/API/lang/cpp/limit-debug-info/derived.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/derived.cpp b/lldb/test/API/lang/cpp/limit-debug-info/derived.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/derived.cpp rename to lldb/test/API/lang/cpp/limit-debug-info/derived.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/main.cpp b/lldb/test/API/lang/cpp/limit-debug-info/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/main.cpp rename to lldb/test/API/lang/cpp/limit-debug-info/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/TestLLVMStyle.py b/lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/TestLLVMStyle.py rename to lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/main.cpp b/lldb/test/API/lang/cpp/llvm-style/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/main.cpp rename to lldb/test/API/lang/cpp/llvm-style/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile b/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile rename to lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py b/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py rename to lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/main.cpp b/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/main.cpp rename to lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Inputs/Bar.h b/lldb/test/API/lang/cpp/modules-import/Inputs/Bar.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Inputs/Bar.h rename to lldb/test/API/lang/cpp/modules-import/Inputs/Bar.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Inputs/Foo.h b/lldb/test/API/lang/cpp/modules-import/Inputs/Foo.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Inputs/Foo.h rename to lldb/test/API/lang/cpp/modules-import/Inputs/Foo.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Inputs/module.modulemap b/lldb/test/API/lang/cpp/modules-import/Inputs/module.modulemap rename from lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Inputs/module.modulemap rename to lldb/test/API/lang/cpp/modules-import/Inputs/module.modulemap diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile b/lldb/test/API/lang/cpp/modules-import/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile rename to lldb/test/API/lang/cpp/modules-import/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/TestCXXModulesImport.py b/lldb/test/API/lang/cpp/modules-import/TestCXXModulesImport.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/TestCXXModulesImport.py rename to lldb/test/API/lang/cpp/modules-import/TestCXXModulesImport.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/main.cpp b/lldb/test/API/lang/cpp/modules-import/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/main.cpp rename to lldb/test/API/lang/cpp/modules-import/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/multiple-inheritance/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/multiple-inheritance/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py b/lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py rename to lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/multiple-inheritance/main.cpp b/lldb/test/API/lang/cpp/multiple-inheritance/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/multiple-inheritance/main.cpp rename to lldb/test/API/lang/cpp/multiple-inheritance/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile b/lldb/test/API/lang/cpp/namespace/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile rename to lldb/test/API/lang/cpp/namespace/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py b/lldb/test/API/lang/cpp/namespace/TestNamespace.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py rename to lldb/test/API/lang/cpp/namespace/TestNamespace.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py b/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py rename to lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/cmds.txt b/lldb/test/API/lang/cpp/namespace/cmds.txt rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/cmds.txt rename to lldb/test/API/lang/cpp/namespace/cmds.txt diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp b/lldb/test/API/lang/cpp/namespace/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp rename to lldb/test/API/lang/cpp/namespace/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h b/lldb/test/API/lang/cpp/namespace/ns.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h rename to lldb/test/API/lang/cpp/namespace/ns.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp b/lldb/test/API/lang/cpp/namespace/ns.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp rename to lldb/test/API/lang/cpp/namespace/ns.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp b/lldb/test/API/lang/cpp/namespace/ns2.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp rename to lldb/test/API/lang/cpp/namespace/ns2.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp b/lldb/test/API/lang/cpp/namespace/ns3.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp rename to lldb/test/API/lang/cpp/namespace/ns3.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py b/lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py rename to lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/main.cpp b/lldb/test/API/lang/cpp/namespace_conflicts/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/main.cpp rename to lldb/test/API/lang/cpp/namespace_conflicts/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile b/lldb/test/API/lang/cpp/namespace_definitions/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile rename to lldb/test/API/lang/cpp/namespace_definitions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py b/lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py rename to lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.cpp b/lldb/test/API/lang/cpp/namespace_definitions/a.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.cpp rename to lldb/test/API/lang/cpp/namespace_definitions/a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.cpp b/lldb/test/API/lang/cpp/namespace_definitions/b.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.cpp rename to lldb/test/API/lang/cpp/namespace_definitions/b.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/foo.h b/lldb/test/API/lang/cpp/namespace_definitions/foo.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/foo.h rename to lldb/test/API/lang/cpp/namespace_definitions/foo.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/main.cpp b/lldb/test/API/lang/cpp/namespace_definitions/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/main.cpp rename to lldb/test/API/lang/cpp/namespace_definitions/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/Makefile b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/Makefile rename to lldb/test/API/lang/cpp/nested-class-other-compilation-unit/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py rename to lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/main.cpp b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/main.cpp rename to lldb/test/API/lang/cpp/nested-class-other-compilation-unit/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/other.cpp b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/other.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/other.cpp rename to lldb/test/API/lang/cpp/nested-class-other-compilation-unit/other.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/shared.h b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/shared.h rename from lldb/packages/Python/lldbsuite/test/lang/cpp/nested-class-other-compilation-unit/shared.h rename to lldb/test/API/lang/cpp/nested-class-other-compilation-unit/shared.h diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/nsimport/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/nsimport/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py b/lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py rename to lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/main.cpp b/lldb/test/API/lang/cpp/nsimport/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/main.cpp rename to lldb/test/API/lang/cpp/nsimport/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/TestOffsetofCpp.py b/lldb/test/API/lang/cpp/offsetof/TestOffsetofCpp.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/TestOffsetofCpp.py rename to lldb/test/API/lang/cpp/offsetof/TestOffsetofCpp.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/main.cpp b/lldb/test/API/lang/cpp/offsetof/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/main.cpp rename to lldb/test/API/lang/cpp/offsetof/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile b/lldb/test/API/lang/cpp/operator-overload/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile rename to lldb/test/API/lang/cpp/operator-overload/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py b/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py rename to lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/a.cpp b/lldb/test/API/lang/cpp/operator-overload/a.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/a.cpp rename to lldb/test/API/lang/cpp/operator-overload/a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/b.cpp b/lldb/test/API/lang/cpp/operator-overload/b.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/b.cpp rename to lldb/test/API/lang/cpp/operator-overload/b.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/TestCppOperators.py b/lldb/test/API/lang/cpp/operators/TestCppOperators.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/operators/TestCppOperators.py rename to lldb/test/API/lang/cpp/operators/TestCppOperators.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/main.cpp b/lldb/test/API/lang/cpp/operators/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/operators/main.cpp rename to lldb/test/API/lang/cpp/operators/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile b/lldb/test/API/lang/cpp/overloaded-functions/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile rename to lldb/test/API/lang/cpp/overloaded-functions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py b/lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py rename to lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/main.cpp b/lldb/test/API/lang/cpp/overloaded-functions/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/main.cpp rename to lldb/test/API/lang/cpp/overloaded-functions/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/static-a.cpp b/lldb/test/API/lang/cpp/overloaded-functions/static-a.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/static-a.cpp rename to lldb/test/API/lang/cpp/overloaded-functions/static-a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/static-b.cpp b/lldb/test/API/lang/cpp/overloaded-functions/static-b.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/static-b.cpp rename to lldb/test/API/lang/cpp/overloaded-functions/static-b.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/TestPrintf.py b/lldb/test/API/lang/cpp/printf/TestPrintf.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/printf/TestPrintf.py rename to lldb/test/API/lang/cpp/printf/TestPrintf.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/main.cpp b/lldb/test/API/lang/cpp/printf/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/printf/main.cpp rename to lldb/test/API/lang/cpp/printf/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile b/lldb/test/API/lang/cpp/rvalue-references/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile rename to lldb/test/API/lang/cpp/rvalue-references/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py b/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py rename to lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/main.cpp b/lldb/test/API/lang/cpp/rvalue-references/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/main.cpp rename to lldb/test/API/lang/cpp/rvalue-references/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/scope/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/scope/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py b/lldb/test/API/lang/cpp/scope/TestCppScope.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py rename to lldb/test/API/lang/cpp/scope/TestCppScope.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/main.cpp b/lldb/test/API/lang/cpp/scope/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/scope/main.cpp rename to lldb/test/API/lang/cpp/scope/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/signed_types/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/signed_types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py b/lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py rename to lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/main.cpp b/lldb/test/API/lang/cpp/signed_types/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/main.cpp rename to lldb/test/API/lang/cpp/signed_types/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/static_members/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/static_members/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py rename to lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/main.cpp b/lldb/test/API/lang/cpp/static_members/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/main.cpp rename to lldb/test/API/lang/cpp/static_members/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/static_methods/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/static_methods/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py b/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py rename to lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/main.cpp b/lldb/test/API/lang/cpp/static_methods/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/main.cpp rename to lldb/test/API/lang/cpp/static_methods/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile b/lldb/test/API/lang/cpp/std-function-step-into-callable/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile rename to lldb/test/API/lang/cpp/std-function-step-into-callable/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py b/lldb/test/API/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py rename to lldb/test/API/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/main.cpp b/lldb/test/API/lang/cpp/std-function-step-into-callable/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/main.cpp rename to lldb/test/API/lang/cpp/std-function-step-into-callable/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile b/lldb/test/API/lang/cpp/stl/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile rename to lldb/test/API/lang/cpp/stl/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py b/lldb/test/API/lang/cpp/stl/TestSTL.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py rename to lldb/test/API/lang/cpp/stl/TestSTL.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py rename to lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/cmds.txt b/lldb/test/API/lang/cpp/stl/cmds.txt rename from lldb/packages/Python/lldbsuite/test/lang/cpp/stl/cmds.txt rename to lldb/test/API/lang/cpp/stl/cmds.txt diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/main.cpp b/lldb/test/API/lang/cpp/stl/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/stl/main.cpp rename to lldb/test/API/lang/cpp/stl/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/TestSymbols.py b/lldb/test/API/lang/cpp/symbols/TestSymbols.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/TestSymbols.py rename to lldb/test/API/lang/cpp/symbols/TestSymbols.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/main.cpp b/lldb/test/API/lang/cpp/symbols/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/main.cpp rename to lldb/test/API/lang/cpp/symbols/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/template-function/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/template-function/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/TestTemplateFunctions.py b/lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/TestTemplateFunctions.py rename to lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/main.cpp b/lldb/test/API/lang/cpp/template-function/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/main.cpp rename to lldb/test/API/lang/cpp/template-function/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/template/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/template/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/TestTemplateArgs.py b/lldb/test/API/lang/cpp/template/TestTemplateArgs.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/template/TestTemplateArgs.py rename to lldb/test/API/lang/cpp/template/TestTemplateArgs.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/main.cpp b/lldb/test/API/lang/cpp/template/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/template/main.cpp rename to lldb/test/API/lang/cpp/template/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/this/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/this/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py b/lldb/test/API/lang/cpp/this/TestCPPThis.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py rename to lldb/test/API/lang/cpp/this/TestCPPThis.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/main.cpp b/lldb/test/API/lang/cpp/this/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/this/main.cpp rename to lldb/test/API/lang/cpp/this/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile b/lldb/test/API/lang/cpp/thread_local/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile rename to lldb/test/API/lang/cpp/thread_local/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/TestThreadLocal.py b/lldb/test/API/lang/cpp/thread_local/TestThreadLocal.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/TestThreadLocal.py rename to lldb/test/API/lang/cpp/thread_local/TestThreadLocal.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/main.cpp b/lldb/test/API/lang/cpp/thread_local/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/main.cpp rename to lldb/test/API/lang/cpp/thread_local/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/trivial_abi/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/trivial_abi/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/TestTrivialABI.py b/lldb/test/API/lang/cpp/trivial_abi/TestTrivialABI.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/TestTrivialABI.py rename to lldb/test/API/lang/cpp/trivial_abi/TestTrivialABI.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/main.cpp b/lldb/test/API/lang/cpp/trivial_abi/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/main.cpp rename to lldb/test/API/lang/cpp/trivial_abi/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile b/lldb/test/API/lang/cpp/type_lookup/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile rename to lldb/test/API/lang/cpp/type_lookup/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py b/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py rename to lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp b/lldb/test/API/lang/cpp/type_lookup/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp rename to lldb/test/API/lang/cpp/type_lookup/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile b/lldb/test/API/lang/cpp/unicode-literals/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile rename to lldb/test/API/lang/cpp/unicode-literals/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/TestUnicodeLiterals.py b/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/TestUnicodeLiterals.py rename to lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/main.cpp b/lldb/test/API/lang/cpp/unicode-literals/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/main.cpp rename to lldb/test/API/lang/cpp/unicode-literals/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/unique-types/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/unique-types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py rename to lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/main.cpp b/lldb/test/API/lang/cpp/unique-types/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/main.cpp rename to lldb/test/API/lang/cpp/unique-types/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/unsigned_types/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/unsigned_types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py rename to lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/main.cpp b/lldb/test/API/lang/cpp/unsigned_types/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/main.cpp rename to lldb/test/API/lang/cpp/unsigned_types/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/cpp/virtual-functions/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/cpp/virtual-functions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-functions/TestCppVirtualFunctions.py b/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-functions/TestCppVirtualFunctions.py rename to lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-functions/main.cpp b/lldb/test/API/lang/cpp/virtual-functions/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-functions/main.cpp rename to lldb/test/API/lang/cpp/virtual-functions/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/TestVirtualOverload.py b/lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/TestVirtualOverload.py rename to lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/main.cpp b/lldb/test/API/lang/cpp/virtual-overload/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/main.cpp rename to lldb/test/API/lang/cpp/virtual-overload/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/.categories b/lldb/test/API/lang/cpp/wchar_t/.categories rename from lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/.categories rename to lldb/test/API/lang/cpp/wchar_t/.categories diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile b/lldb/test/API/lang/cpp/wchar_t/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile rename to lldb/test/API/lang/cpp/wchar_t/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py rename from lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py rename to lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/main.cpp b/lldb/test/API/lang/cpp/wchar_t/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/main.cpp rename to lldb/test/API/lang/cpp/wchar_t/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile b/lldb/test/API/lang/mixed/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile rename to lldb/test/API/lang/mixed/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py b/lldb/test/API/lang/mixed/TestMixedLanguages.py rename from lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py rename to lldb/test/API/lang/mixed/TestMixedLanguages.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/mixed/foo.cpp b/lldb/test/API/lang/mixed/foo.cpp rename from lldb/packages/Python/lldbsuite/test/lang/mixed/foo.cpp rename to lldb/test/API/lang/mixed/foo.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/mixed/main.c b/lldb/test/API/lang/mixed/main.c rename from lldb/packages/Python/lldbsuite/test/lang/mixed/main.c rename to lldb/test/API/lang/mixed/main.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/.categories b/lldb/test/API/lang/objc/.categories rename from lldb/packages/Python/lldbsuite/test/lang/objc/.categories rename to lldb/test/API/lang/objc/.categories diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/TestBitfieldIvars.py b/lldb/test/API/lang/objc/bitfield_ivars/TestBitfieldIvars.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/TestBitfieldIvars.py rename to lldb/test/API/lang/objc/bitfield_ivars/TestBitfieldIvars.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/main.m b/lldb/test/API/lang/objc/bitfield_ivars/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/main.m rename to lldb/test/API/lang/objc/bitfield_ivars/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile b/lldb/test/API/lang/objc/blocks/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile rename to lldb/test/API/lang/objc/blocks/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py rename to lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/ivars-in-blocks.h b/lldb/test/API/lang/objc/blocks/ivars-in-blocks.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/blocks/ivars-in-blocks.h rename to lldb/test/API/lang/objc/blocks/ivars-in-blocks.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/ivars-in-blocks.m b/lldb/test/API/lang/objc/blocks/ivars-in-blocks.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/blocks/ivars-in-blocks.m rename to lldb/test/API/lang/objc/blocks/ivars-in-blocks.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/main.m b/lldb/test/API/lang/objc/blocks/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/blocks/main.m rename to lldb/test/API/lang/objc/blocks/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile b/lldb/test/API/lang/objc/conflicting-definition/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile rename to lldb/test/API/lang/objc/conflicting-definition/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Foo.h b/lldb/test/API/lang/objc/conflicting-definition/Test/Foo.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Foo.h rename to lldb/test/API/lang/objc/conflicting-definition/Test/Foo.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.h b/lldb/test/API/lang/objc/conflicting-definition/Test/Test.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.h rename to lldb/test/API/lang/objc/conflicting-definition/Test/Test.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.m b/lldb/test/API/lang/objc/conflicting-definition/Test/Test.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.m rename to lldb/test/API/lang/objc/conflicting-definition/Test/Test.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestConflictingDefinition.py b/lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestConflictingDefinition.py rename to lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/Foo.h b/lldb/test/API/lang/objc/conflicting-definition/TestExt/Foo.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/Foo.h rename to lldb/test/API/lang/objc/conflicting-definition/TestExt/Foo.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.h b/lldb/test/API/lang/objc/conflicting-definition/TestExt/TestExt.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.h rename to lldb/test/API/lang/objc/conflicting-definition/TestExt/TestExt.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.m b/lldb/test/API/lang/objc/conflicting-definition/TestExt/TestExt.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.m rename to lldb/test/API/lang/objc/conflicting-definition/TestExt/TestExt.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/main.m b/lldb/test/API/lang/objc/conflicting-definition/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/main.m rename to lldb/test/API/lang/objc/conflicting-definition/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/direct-dispatch-step/Makefile b/lldb/test/API/lang/objc/direct-dispatch-step/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/direct-dispatch-step/Makefile rename to lldb/test/API/lang/objc/direct-dispatch-step/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py b/lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py rename to lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/direct-dispatch-step/stepping-tests.m b/lldb/test/API/lang/objc/direct-dispatch-step/stepping-tests.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/direct-dispatch-step/stepping-tests.m rename to lldb/test/API/lang/objc/direct-dispatch-step/stepping-tests.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile b/lldb/test/API/lang/objc/exceptions/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile rename to lldb/test/API/lang/objc/exceptions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py b/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py rename to lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/main.mm b/lldb/test/API/lang/objc/exceptions/main.mm rename from lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/main.mm rename to lldb/test/API/lang/objc/exceptions/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Container.h b/lldb/test/API/lang/objc/forward-decl/Container.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Container.h rename to lldb/test/API/lang/objc/forward-decl/Container.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Container.m b/lldb/test/API/lang/objc/forward-decl/Container.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Container.m rename to lldb/test/API/lang/objc/forward-decl/Container.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile b/lldb/test/API/lang/objc/forward-decl/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile rename to lldb/test/API/lang/objc/forward-decl/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py b/lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py rename to lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/main.m b/lldb/test/API/lang/objc/forward-decl/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/main.m rename to lldb/test/API/lang/objc/forward-decl/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile b/lldb/test/API/lang/objc/foundation/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile rename to lldb/test/API/lang/objc/foundation/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py b/lldb/test/API/lang/objc/foundation/TestConstStrings.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py rename to lldb/test/API/lang/objc/foundation/TestConstStrings.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py b/lldb/test/API/lang/objc/foundation/TestFoundationDisassembly.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py rename to lldb/test/API/lang/objc/foundation/TestFoundationDisassembly.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py b/lldb/test/API/lang/objc/foundation/TestObjCMethods.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py rename to lldb/test/API/lang/objc/foundation/TestObjCMethods.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/test/API/lang/objc/foundation/TestObjCMethods2.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py rename to lldb/test/API/lang/objc/foundation/TestObjCMethods2.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSArray.py b/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSArray.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSArray.py rename to lldb/test/API/lang/objc/foundation/TestObjCMethodsNSArray.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSError.py b/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSError.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSError.py rename to lldb/test/API/lang/objc/foundation/TestObjCMethodsNSError.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsString.py b/lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsString.py rename to lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py rename to lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py b/lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py rename to lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py b/lldb/test/API/lang/objc/foundation/TestSymbolTable.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py rename to lldb/test/API/lang/objc/foundation/TestSymbolTable.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/const-strings.m b/lldb/test/API/lang/objc/foundation/const-strings.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/const-strings.m rename to lldb/test/API/lang/objc/foundation/const-strings.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/main.m b/lldb/test/API/lang/objc/foundation/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/main.m rename to lldb/test/API/lang/objc/foundation/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/my-base.h b/lldb/test/API/lang/objc/foundation/my-base.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/my-base.h rename to lldb/test/API/lang/objc/foundation/my-base.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/my-base.m b/lldb/test/API/lang/objc/foundation/my-base.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/foundation/my-base.m rename to lldb/test/API/lang/objc/foundation/my-base.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile b/lldb/test/API/lang/objc/global_ptrs/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile rename to lldb/test/API/lang/objc/global_ptrs/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/TestGlobalObjects.py b/lldb/test/API/lang/objc/global_ptrs/TestGlobalObjects.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/TestGlobalObjects.py rename to lldb/test/API/lang/objc/global_ptrs/TestGlobalObjects.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/main.m b/lldb/test/API/lang/objc/global_ptrs/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/main.m rename to lldb/test/API/lang/objc/global_ptrs/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/InternalDefiner.h b/lldb/test/API/lang/objc/hidden-ivars/InternalDefiner.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/InternalDefiner.h rename to lldb/test/API/lang/objc/hidden-ivars/InternalDefiner.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/InternalDefiner.m b/lldb/test/API/lang/objc/hidden-ivars/InternalDefiner.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/InternalDefiner.m rename to lldb/test/API/lang/objc/hidden-ivars/InternalDefiner.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile b/lldb/test/API/lang/objc/hidden-ivars/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile rename to lldb/test/API/lang/objc/hidden-ivars/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py rename to lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/main.m b/lldb/test/API/lang/objc/hidden-ivars/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/main.m rename to lldb/test/API/lang/objc/hidden-ivars/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile b/lldb/test/API/lang/objc/ivar-IMP/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile rename to lldb/test/API/lang/objc/ivar-IMP/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py b/lldb/test/API/lang/objc/ivar-IMP/TestObjCiVarIMP.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py rename to lldb/test/API/lang/objc/ivar-IMP/TestObjCiVarIMP.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/myclass.h b/lldb/test/API/lang/objc/ivar-IMP/myclass.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/myclass.h rename to lldb/test/API/lang/objc/ivar-IMP/myclass.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/myclass.m b/lldb/test/API/lang/objc/ivar-IMP/myclass.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/myclass.m rename to lldb/test/API/lang/objc/ivar-IMP/myclass.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/repro.m b/lldb/test/API/lang/objc/ivar-IMP/repro.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/repro.m rename to lldb/test/API/lang/objc/ivar-IMP/repro.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/Makefile b/lldb/test/API/lang/objc/modules-app-update/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/Makefile rename to lldb/test/API/lang/objc/modules-app-update/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/TestClangModulesAppUpdate.py b/lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/TestClangModulesAppUpdate.py rename to lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/foo.m b/lldb/test/API/lang/objc/modules-app-update/foo.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/foo.m rename to lldb/test/API/lang/objc/modules-app-update/foo.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/main.m b/lldb/test/API/lang/objc/modules-app-update/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/main.m rename to lldb/test/API/lang/objc/modules-app-update/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/module.modulemap b/lldb/test/API/lang/objc/modules-app-update/module.modulemap rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/module.modulemap rename to lldb/test/API/lang/objc/modules-app-update/module.modulemap diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/umbrella.h b/lldb/test/API/lang/objc/modules-app-update/umbrella.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/umbrella.h rename to lldb/test/API/lang/objc/modules-app-update/umbrella.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile b/lldb/test/API/lang/objc/modules-auto-import/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile rename to lldb/test/API/lang/objc/modules-auto-import/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py b/lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py rename to lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/main.m b/lldb/test/API/lang/objc/modules-auto-import/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/main.m rename to lldb/test/API/lang/objc/modules-auto-import/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile b/lldb/test/API/lang/objc/modules-cache/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile rename to lldb/test/API/lang/objc/modules-cache/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py b/lldb/test/API/lang/objc/modules-cache/TestClangModulesCache.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py rename to lldb/test/API/lang/objc/modules-cache/TestClangModulesCache.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/f.h b/lldb/test/API/lang/objc/modules-cache/f.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/f.h rename to lldb/test/API/lang/objc/modules-cache/f.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/main.m b/lldb/test/API/lang/objc/modules-cache/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/main.m rename to lldb/test/API/lang/objc/modules-cache/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/module.modulemap b/lldb/test/API/lang/objc/modules-cache/module.modulemap rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/module.modulemap rename to lldb/test/API/lang/objc/modules-cache/module.modulemap diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/Makefile b/lldb/test/API/lang/objc/modules-hash-mismatch/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/Makefile rename to lldb/test/API/lang/objc/modules-hash-mismatch/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py b/lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py rename to lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/main.m b/lldb/test/API/lang/objc/modules-hash-mismatch/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/main.m rename to lldb/test/API/lang/objc/modules-hash-mismatch/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/other.m b/lldb/test/API/lang/objc/modules-hash-mismatch/other.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/other.m rename to lldb/test/API/lang/objc/modules-hash-mismatch/other.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile b/lldb/test/API/lang/objc/modules-incomplete/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile rename to lldb/test/API/lang/objc/modules-incomplete/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py rename to lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/main.m b/lldb/test/API/lang/objc/modules-incomplete/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/main.m rename to lldb/test/API/lang/objc/modules-incomplete/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/minmax.h b/lldb/test/API/lang/objc/modules-incomplete/minmax.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/minmax.h rename to lldb/test/API/lang/objc/modules-incomplete/minmax.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/module.map b/lldb/test/API/lang/objc/modules-incomplete/module.map rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/module.map rename to lldb/test/API/lang/objc/modules-incomplete/module.map diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/myModule.h b/lldb/test/API/lang/objc/modules-incomplete/myModule.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/myModule.h rename to lldb/test/API/lang/objc/modules-incomplete/myModule.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/myModule.m b/lldb/test/API/lang/objc/modules-incomplete/myModule.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/myModule.m rename to lldb/test/API/lang/objc/modules-incomplete/myModule.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile b/lldb/test/API/lang/objc/modules-inline-functions/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile rename to lldb/test/API/lang/objc/modules-inline-functions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py rename to lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/main.m b/lldb/test/API/lang/objc/modules-inline-functions/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/main.m rename to lldb/test/API/lang/objc/modules-inline-functions/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/module.map b/lldb/test/API/lang/objc/modules-inline-functions/module.map rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/module.map rename to lldb/test/API/lang/objc/modules-inline-functions/module.map diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/myModule.h b/lldb/test/API/lang/objc/modules-inline-functions/myModule.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/myModule.h rename to lldb/test/API/lang/objc/modules-inline-functions/myModule.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/myModule.c b/lldb/test/API/lang/objc/modules-inline-functions/myModule.c rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/myModule.c rename to lldb/test/API/lang/objc/modules-inline-functions/myModule.c diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/Makefile b/lldb/test/API/lang/objc/modules-update/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/Makefile rename to lldb/test/API/lang/objc/modules-update/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/TestClangModulesUpdate.py b/lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/TestClangModulesUpdate.py rename to lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/first.m b/lldb/test/API/lang/objc/modules-update/first.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/first.m rename to lldb/test/API/lang/objc/modules-update/first.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/module.modulemap b/lldb/test/API/lang/objc/modules-update/module.modulemap rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/module.modulemap rename to lldb/test/API/lang/objc/modules-update/module.modulemap diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/second.m b/lldb/test/API/lang/objc/modules-update/second.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/second.m rename to lldb/test/API/lang/objc/modules-update/second.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/umbrella.h b/lldb/test/API/lang/objc/modules-update/umbrella.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/umbrella.h rename to lldb/test/API/lang/objc/modules-update/umbrella.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile b/lldb/test/API/lang/objc/modules/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile rename to lldb/test/API/lang/objc/modules/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py b/lldb/test/API/lang/objc/modules/TestObjCModules.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py rename to lldb/test/API/lang/objc/modules/TestObjCModules.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/main.m b/lldb/test/API/lang/objc/modules/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/modules/main.m rename to lldb/test/API/lang/objc/modules/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile b/lldb/test/API/lang/objc/objc++/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile rename to lldb/test/API/lang/objc/objc++/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py b/lldb/test/API/lang/objc/objc++/TestObjCXX.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py rename to lldb/test/API/lang/objc/objc++/TestObjCXX.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/main.mm b/lldb/test/API/lang/objc/objc++/main.mm rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc++/main.mm rename to lldb/test/API/lang/objc/objc++/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile b/lldb/test/API/lang/objc/objc-baseclass-sbtype/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile rename to lldb/test/API/lang/objc/objc-baseclass-sbtype/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py b/lldb/test/API/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py rename to lldb/test/API/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/main.m b/lldb/test/API/lang/objc/objc-baseclass-sbtype/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/main.m rename to lldb/test/API/lang/objc/objc-baseclass-sbtype/main.m diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/lang/objc/objc-builtin-types/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/lang/objc/objc-builtin-types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py b/lldb/test/API/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py rename to lldb/test/API/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/main.cpp b/lldb/test/API/lang/objc/objc-builtin-types/main.cpp rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/main.cpp rename to lldb/test/API/lang/objc/objc-builtin-types/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile b/lldb/test/API/lang/objc/objc-checker/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile rename to lldb/test/API/lang/objc/objc-checker/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py b/lldb/test/API/lang/objc/objc-checker/TestObjCCheckers.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py rename to lldb/test/API/lang/objc/objc-checker/TestObjCCheckers.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/main.m b/lldb/test/API/lang/objc/objc-checker/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/main.m rename to lldb/test/API/lang/objc/objc-checker/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile b/lldb/test/API/lang/objc/objc-class-method/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile rename to lldb/test/API/lang/objc/objc-class-method/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py rename to lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/class.m b/lldb/test/API/lang/objc/objc-class-method/class.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/class.m rename to lldb/test/API/lang/objc/objc-class-method/class.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/.categories b/lldb/test/API/lang/objc/objc-dyn-sbtype/.categories rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/.categories rename to lldb/test/API/lang/objc/objc-dyn-sbtype/.categories diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile b/lldb/test/API/lang/objc/objc-dyn-sbtype/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile rename to lldb/test/API/lang/objc/objc-dyn-sbtype/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/test/API/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py rename to lldb/test/API/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/main.m b/lldb/test/API/lang/objc/objc-dyn-sbtype/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/main.m rename to lldb/test/API/lang/objc/objc-dyn-sbtype/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile b/lldb/test/API/lang/objc/objc-dynamic-value/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile rename to lldb/test/API/lang/objc/objc-dynamic-value/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/test/API/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py rename to lldb/test/API/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/dynamic-value.m b/lldb/test/API/lang/objc/objc-dynamic-value/dynamic-value.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/dynamic-value.m rename to lldb/test/API/lang/objc/objc-dynamic-value/dynamic-value.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/TestNSDictionary0.py b/lldb/test/API/lang/objc/objc-foundation-dictionary-empty/TestNSDictionary0.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/TestNSDictionary0.py rename to lldb/test/API/lang/objc/objc-foundation-dictionary-empty/TestNSDictionary0.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/main.m b/lldb/test/API/lang/objc/objc-foundation-dictionary-empty/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/main.m rename to lldb/test/API/lang/objc/objc-foundation-dictionary-empty/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile b/lldb/test/API/lang/objc/objc-ivar-offsets/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile rename to lldb/test/API/lang/objc/objc-ivar-offsets/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/test/API/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py rename to lldb/test/API/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/main.m b/lldb/test/API/lang/objc/objc-ivar-offsets/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/main.m rename to lldb/test/API/lang/objc/objc-ivar-offsets/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h b/lldb/test/API/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h rename to lldb/test/API/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m b/lldb/test/API/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m rename to lldb/test/API/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py b/lldb/test/API/lang/objc/objc-ivar-protocols/TestIvarProtocols.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py rename to lldb/test/API/lang/objc/objc-ivar-protocols/TestIvarProtocols.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/main.m b/lldb/test/API/lang/objc/objc-ivar-protocols/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/main.m rename to lldb/test/API/lang/objc/objc-ivar-protocols/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile b/lldb/test/API/lang/objc/objc-ivar-stripped/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile rename to lldb/test/API/lang/objc/objc-ivar-stripped/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py b/lldb/test/API/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py rename to lldb/test/API/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/main.m b/lldb/test/API/lang/objc/objc-ivar-stripped/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/main.m rename to lldb/test/API/lang/objc/objc-ivar-stripped/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile b/lldb/test/API/lang/objc/objc-new-syntax/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile rename to lldb/test/API/lang/objc/objc-new-syntax/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py b/lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py rename to lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxArray.py b/lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxArray.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxArray.py rename to lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxArray.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxDictionary.py b/lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxDictionary.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxDictionary.py rename to lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxDictionary.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py b/lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py rename to lldb/test/API/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/main.m b/lldb/test/API/lang/objc/objc-new-syntax/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/main.m rename to lldb/test/API/lang/objc/objc-new-syntax/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile b/lldb/test/API/lang/objc/objc-optimized/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile rename to lldb/test/API/lang/objc/objc-optimized/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py b/lldb/test/API/lang/objc/objc-optimized/TestObjcOptimized.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py rename to lldb/test/API/lang/objc/objc-optimized/TestObjcOptimized.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/main.m b/lldb/test/API/lang/objc/objc-optimized/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/main.m rename to lldb/test/API/lang/objc/objc-optimized/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile b/lldb/test/API/lang/objc/objc-property/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile rename to lldb/test/API/lang/objc/objc-property/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py b/lldb/test/API/lang/objc/objc-property/TestObjCProperty.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py rename to lldb/test/API/lang/objc/objc-property/TestObjCProperty.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/main.m b/lldb/test/API/lang/objc/objc-property/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/main.m rename to lldb/test/API/lang/objc/objc-property/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile b/lldb/test/API/lang/objc/objc-runtime-ivars/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile rename to lldb/test/API/lang/objc/objc-runtime-ivars/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py b/lldb/test/API/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py rename to lldb/test/API/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/main.m b/lldb/test/API/lang/objc/objc-runtime-ivars/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/main.m rename to lldb/test/API/lang/objc/objc-runtime-ivars/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile b/lldb/test/API/lang/objc/objc-static-method-stripped/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile rename to lldb/test/API/lang/objc/objc-static-method-stripped/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py b/lldb/test/API/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py rename to lldb/test/API/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/static.m b/lldb/test/API/lang/objc/objc-static-method-stripped/static.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/static.m rename to lldb/test/API/lang/objc/objc-static-method-stripped/static.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile b/lldb/test/API/lang/objc/objc-static-method/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile rename to lldb/test/API/lang/objc/objc-static-method/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/test/API/lang/objc/objc-static-method/TestObjCStaticMethod.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py rename to lldb/test/API/lang/objc/objc-static-method/TestObjCStaticMethod.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/static.m b/lldb/test/API/lang/objc/objc-static-method/static.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/static.m rename to lldb/test/API/lang/objc/objc-static-method/static.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile b/lldb/test/API/lang/objc/objc-stepping/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile rename to lldb/test/API/lang/objc/objc-stepping/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py b/lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py rename to lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/stepping-tests.m b/lldb/test/API/lang/objc/objc-stepping/stepping-tests.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/stepping-tests.m rename to lldb/test/API/lang/objc/objc-stepping/stepping-tests.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile b/lldb/test/API/lang/objc/objc-struct-argument/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile rename to lldb/test/API/lang/objc/objc-struct-argument/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py rename to lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m b/lldb/test/API/lang/objc/objc-struct-argument/test.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m rename to lldb/test/API/lang/objc/objc-struct-argument/test.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile b/lldb/test/API/lang/objc/objc-struct-return/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile rename to lldb/test/API/lang/objc/objc-struct-return/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py b/lldb/test/API/lang/objc/objc-struct-return/TestObjCStructReturn.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py rename to lldb/test/API/lang/objc/objc-struct-return/TestObjCStructReturn.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/test.m b/lldb/test/API/lang/objc/objc-struct-return/test.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/test.m rename to lldb/test/API/lang/objc/objc-struct-return/test.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile b/lldb/test/API/lang/objc/objc-super/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile rename to lldb/test/API/lang/objc/objc-super/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py b/lldb/test/API/lang/objc/objc-super/TestObjCSuper.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py rename to lldb/test/API/lang/objc/objc-super/TestObjCSuper.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/class.m b/lldb/test/API/lang/objc/objc-super/class.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/class.m rename to lldb/test/API/lang/objc/objc-super/class.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc_direct-methods/Makefile b/lldb/test/API/lang/objc/objc_direct-methods/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc_direct-methods/Makefile rename to lldb/test/API/lang/objc/objc_direct-methods/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc_direct-methods/TestObjCDirectMethods.py b/lldb/test/API/lang/objc/objc_direct-methods/TestObjCDirectMethods.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc_direct-methods/TestObjCDirectMethods.py rename to lldb/test/API/lang/objc/objc_direct-methods/TestObjCDirectMethods.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc_direct-methods/main.m b/lldb/test/API/lang/objc/objc_direct-methods/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/objc_direct-methods/main.m rename to lldb/test/API/lang/objc/objc_direct-methods/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile b/lldb/test/API/lang/objc/orderedset/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile rename to lldb/test/API/lang/objc/orderedset/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/TestOrderedSet.py b/lldb/test/API/lang/objc/orderedset/TestOrderedSet.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/TestOrderedSet.py rename to lldb/test/API/lang/objc/orderedset/TestOrderedSet.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/main.m b/lldb/test/API/lang/objc/orderedset/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/main.m rename to lldb/test/API/lang/objc/orderedset/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile b/lldb/test/API/lang/objc/print-obj/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile rename to lldb/test/API/lang/objc/print-obj/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py b/lldb/test/API/lang/objc/print-obj/TestPrintObj.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py rename to lldb/test/API/lang/objc/print-obj/TestPrintObj.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/blocked.m b/lldb/test/API/lang/objc/print-obj/blocked.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/blocked.m rename to lldb/test/API/lang/objc/print-obj/blocked.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile b/lldb/test/API/lang/objc/ptr_refs/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile rename to lldb/test/API/lang/objc/ptr_refs/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/TestPtrRefsObjC.py b/lldb/test/API/lang/objc/ptr_refs/TestPtrRefsObjC.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/TestPtrRefsObjC.py rename to lldb/test/API/lang/objc/ptr_refs/TestPtrRefsObjC.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/main.m b/lldb/test/API/lang/objc/ptr_refs/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/main.m rename to lldb/test/API/lang/objc/ptr_refs/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile b/lldb/test/API/lang/objc/radar-9691614/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile rename to lldb/test/API/lang/objc/radar-9691614/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/test/API/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py rename to lldb/test/API/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/main.m b/lldb/test/API/lang/objc/radar-9691614/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/main.m rename to lldb/test/API/lang/objc/radar-9691614/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile b/lldb/test/API/lang/objc/rdar-10967107/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile rename to lldb/test/API/lang/objc/rdar-10967107/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/test/API/lang/objc/rdar-10967107/TestRdar10967107.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py rename to lldb/test/API/lang/objc/rdar-10967107/TestRdar10967107.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/main.m b/lldb/test/API/lang/objc/rdar-10967107/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/main.m rename to lldb/test/API/lang/objc/rdar-10967107/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile b/lldb/test/API/lang/objc/rdar-11355592/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile rename to lldb/test/API/lang/objc/rdar-11355592/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py rename to lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/main.m b/lldb/test/API/lang/objc/rdar-11355592/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/main.m rename to lldb/test/API/lang/objc/rdar-11355592/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile b/lldb/test/API/lang/objc/rdar-12408181/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile rename to lldb/test/API/lang/objc/rdar-12408181/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/test/API/lang/objc/rdar-12408181/TestRdar12408181.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py rename to lldb/test/API/lang/objc/rdar-12408181/TestRdar12408181.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/main.m b/lldb/test/API/lang/objc/rdar-12408181/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/main.m rename to lldb/test/API/lang/objc/rdar-12408181/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Bar.h b/lldb/test/API/lang/objc/real-definition/Bar.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Bar.h rename to lldb/test/API/lang/objc/real-definition/Bar.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Bar.m b/lldb/test/API/lang/objc/real-definition/Bar.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Bar.m rename to lldb/test/API/lang/objc/real-definition/Bar.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Foo.h b/lldb/test/API/lang/objc/real-definition/Foo.h rename from lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Foo.h rename to lldb/test/API/lang/objc/real-definition/Foo.h diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Foo.m b/lldb/test/API/lang/objc/real-definition/Foo.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Foo.m rename to lldb/test/API/lang/objc/real-definition/Foo.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile b/lldb/test/API/lang/objc/real-definition/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile rename to lldb/test/API/lang/objc/real-definition/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py b/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py rename to lldb/test/API/lang/objc/real-definition/TestRealDefinition.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/main.m b/lldb/test/API/lang/objc/real-definition/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/main.m rename to lldb/test/API/lang/objc/real-definition/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile b/lldb/test/API/lang/objc/sample/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile rename to lldb/test/API/lang/objc/sample/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/sample/main.m b/lldb/test/API/lang/objc/sample/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/sample/main.m rename to lldb/test/API/lang/objc/sample/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile b/lldb/test/API/lang/objc/self/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile rename to lldb/test/API/lang/objc/self/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py b/lldb/test/API/lang/objc/self/TestObjCSelf.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py rename to lldb/test/API/lang/objc/self/TestObjCSelf.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/self/main.m b/lldb/test/API/lang/objc/self/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/self/main.m rename to lldb/test/API/lang/objc/self/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile b/lldb/test/API/lang/objc/single-entry-dictionary/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile rename to lldb/test/API/lang/objc/single-entry-dictionary/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py b/lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py rename to lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/main.m b/lldb/test/API/lang/objc/single-entry-dictionary/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/main.m rename to lldb/test/API/lang/objc/single-entry-dictionary/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/unicode-string/TestUnicodeString.py b/lldb/test/API/lang/objc/unicode-string/TestUnicodeString.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/unicode-string/TestUnicodeString.py rename to lldb/test/API/lang/objc/unicode-string/TestUnicodeString.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/unicode-string/main.m b/lldb/test/API/lang/objc/unicode-string/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/unicode-string/main.m rename to lldb/test/API/lang/objc/unicode-string/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/variadic_methods/TestVariadicMethods.py b/lldb/test/API/lang/objc/variadic_methods/TestVariadicMethods.py rename from lldb/packages/Python/lldbsuite/test/lang/objc/variadic_methods/TestVariadicMethods.py rename to lldb/test/API/lang/objc/variadic_methods/TestVariadicMethods.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/variadic_methods/main.m b/lldb/test/API/lang/objc/variadic_methods/main.m rename from lldb/packages/Python/lldbsuite/test/lang/objc/variadic_methods/main.m rename to lldb/test/API/lang/objc/variadic_methods/main.m diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile b/lldb/test/API/lang/objcxx/class-name-clash/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile rename to lldb/test/API/lang/objcxx/class-name-clash/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/TestNameClash.py b/lldb/test/API/lang/objcxx/class-name-clash/TestNameClash.py rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/TestNameClash.py rename to lldb/test/API/lang/objcxx/class-name-clash/TestNameClash.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/main.mm b/lldb/test/API/lang/objcxx/class-name-clash/main.mm rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/main.mm rename to lldb/test/API/lang/objcxx/class-name-clash/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/myobject.mm b/lldb/test/API/lang/objcxx/class-name-clash/myobject.mm rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/myobject.mm rename to lldb/test/API/lang/objcxx/class-name-clash/myobject.mm diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile b/lldb/test/API/lang/objcxx/cxx-bridged-po/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile rename to lldb/test/API/lang/objcxx/cxx-bridged-po/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/TestObjCXXBridgedPO.py b/lldb/test/API/lang/objcxx/cxx-bridged-po/TestObjCXXBridgedPO.py rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/TestObjCXXBridgedPO.py rename to lldb/test/API/lang/objcxx/cxx-bridged-po/TestObjCXXBridgedPO.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/main.mm b/lldb/test/API/lang/objcxx/cxx-bridged-po/main.mm rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/main.mm rename to lldb/test/API/lang/objcxx/cxx-bridged-po/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile b/lldb/test/API/lang/objcxx/hide-runtime-values/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile rename to lldb/test/API/lang/objcxx/hide-runtime-values/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/TestObjCXXHideRuntimeValues.py b/lldb/test/API/lang/objcxx/hide-runtime-values/TestObjCXXHideRuntimeValues.py rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/TestObjCXXHideRuntimeValues.py rename to lldb/test/API/lang/objcxx/hide-runtime-values/TestObjCXXHideRuntimeValues.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/main.mm b/lldb/test/API/lang/objcxx/hide-runtime-values/main.mm rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/main.mm rename to lldb/test/API/lang/objcxx/hide-runtime-values/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py b/lldb/test/API/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py rename to lldb/test/API/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/main.mm b/lldb/test/API/lang/objcxx/objcxx-ivar-vector/main.mm rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/main.mm rename to lldb/test/API/lang/objcxx/objcxx-ivar-vector/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile b/lldb/test/API/lang/objcxx/sample/Makefile rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile rename to lldb/test/API/lang/objcxx/sample/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/main.mm b/lldb/test/API/lang/objcxx/sample/main.mm rename from lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/main.mm rename to lldb/test/API/lang/objcxx/sample/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile b/lldb/test/API/linux/add-symbols/Makefile rename from lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile rename to lldb/test/API/linux/add-symbols/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/TestTargetSymbolsAddCommand.py b/lldb/test/API/linux/add-symbols/TestTargetSymbolsAddCommand.py rename from lldb/packages/Python/lldbsuite/test/linux/add-symbols/TestTargetSymbolsAddCommand.py rename to lldb/test/API/linux/add-symbols/TestTargetSymbolsAddCommand.py diff --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/main.c b/lldb/test/API/linux/add-symbols/main.c rename from lldb/packages/Python/lldbsuite/test/linux/add-symbols/main.c rename to lldb/test/API/linux/add-symbols/main.c diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/linux/builtin_trap/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/linux/builtin_trap/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py b/lldb/test/API/linux/builtin_trap/TestBuiltinTrap.py rename from lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py rename to lldb/test/API/linux/builtin_trap/TestBuiltinTrap.py diff --git a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/main.cpp b/lldb/test/API/linux/builtin_trap/main.cpp rename from lldb/packages/Python/lldbsuite/test/linux/builtin_trap/main.cpp rename to lldb/test/API/linux/builtin_trap/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile b/lldb/test/API/linux/mix-dwo-and-regular-objects/Makefile rename from lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile rename to lldb/test/API/linux/mix-dwo-and-regular-objects/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py b/lldb/test/API/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py rename from lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py rename to lldb/test/API/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py diff --git a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c b/lldb/test/API/linux/mix-dwo-and-regular-objects/a.c rename from lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c rename to lldb/test/API/linux/mix-dwo-and-regular-objects/a.c diff --git a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c b/lldb/test/API/linux/mix-dwo-and-regular-objects/b.c rename from lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c rename to lldb/test/API/linux/mix-dwo-and-regular-objects/b.c diff --git a/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile b/lldb/test/API/linux/sepdebugsymlink/Makefile rename from lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile rename to lldb/test/API/linux/sepdebugsymlink/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/TestTargetSymbolsSepDebugSymlink.py b/lldb/test/API/linux/sepdebugsymlink/TestTargetSymbolsSepDebugSymlink.py rename from lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/TestTargetSymbolsSepDebugSymlink.py rename to lldb/test/API/linux/sepdebugsymlink/TestTargetSymbolsSepDebugSymlink.py diff --git a/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/main.c b/lldb/test/API/linux/sepdebugsymlink/main.c rename from lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/main.c rename to lldb/test/API/linux/sepdebugsymlink/main.c diff --git a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile b/lldb/test/API/linux/thread/create_during_instruction_step/Makefile rename from lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile rename to lldb/test/API/linux/thread/create_during_instruction_step/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py b/lldb/test/API/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py rename from lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py rename to lldb/test/API/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py diff --git a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/main.cpp b/lldb/test/API/linux/thread/create_during_instruction_step/main.cpp rename from lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/main.cpp rename to lldb/test/API/linux/thread/create_during_instruction_step/main.cpp diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -17,8 +17,7 @@ # test_source_root: The root path where tests are located. # test_exec_root: The root path where tests should be run. -config.test_source_root = os.path.join(config.lldb_src_root, 'packages', - 'Python', 'lldbsuite', 'test') +config.test_source_root = os.path.dirname(__file__) config.test_exec_root = config.test_source_root if 'Address' in config.llvm_use_sanitizer: diff --git a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Inputs/main.c b/lldb/test/API/macosx/DBGSourcePathRemapping/Inputs/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Inputs/main.c rename to lldb/test/API/macosx/DBGSourcePathRemapping/Inputs/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Inputs/relative.c b/lldb/test/API/macosx/DBGSourcePathRemapping/Inputs/relative.c rename from lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Inputs/relative.c rename to lldb/test/API/macosx/DBGSourcePathRemapping/Inputs/relative.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Makefile b/lldb/test/API/macosx/DBGSourcePathRemapping/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Makefile rename to lldb/test/API/macosx/DBGSourcePathRemapping/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py b/lldb/test/API/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py rename from lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py rename to lldb/test/API/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile b/lldb/test/API/macosx/add-dsym/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile rename to lldb/test/API/macosx/add-dsym/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py b/lldb/test/API/macosx/add-dsym/TestAddDsymMidExecutionCommand.py rename from lldb/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py rename to lldb/test/API/macosx/add-dsym/TestAddDsymMidExecutionCommand.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/main.c b/lldb/test/API/macosx/add-dsym/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/add-dsym/main.c rename to lldb/test/API/macosx/add-dsym/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile b/lldb/test/API/macosx/duplicate-archive-members/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile rename to lldb/test/API/macosx/duplicate-archive-members/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/TestDuplicateMembers.py b/lldb/test/API/macosx/duplicate-archive-members/TestDuplicateMembers.py rename from lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/TestDuplicateMembers.py rename to lldb/test/API/macosx/duplicate-archive-members/TestDuplicateMembers.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/a.c b/lldb/test/API/macosx/duplicate-archive-members/a.c rename from lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/a.c rename to lldb/test/API/macosx/duplicate-archive-members/a.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/main.c b/lldb/test/API/macosx/duplicate-archive-members/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/main.c rename to lldb/test/API/macosx/duplicate-archive-members/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/sub1/a.c b/lldb/test/API/macosx/duplicate-archive-members/sub1/a.c rename from lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/sub1/a.c rename to lldb/test/API/macosx/duplicate-archive-members/sub1/a.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile b/lldb/test/API/macosx/find-app-in-bundle/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile rename to lldb/test/API/macosx/find-app-in-bundle/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestApp.app/Contents/Info.plist b/lldb/test/API/macosx/find-app-in-bundle/TestApp.app/Contents/Info.plist rename from lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestApp.app/Contents/Info.plist rename to lldb/test/API/macosx/find-app-in-bundle/TestApp.app/Contents/Info.plist diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestApp.app/Contents/MacOS/.empty b/lldb/test/API/macosx/find-app-in-bundle/TestApp.app/Contents/MacOS/.empty rename from lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestApp.app/Contents/MacOS/.empty rename to lldb/test/API/macosx/find-app-in-bundle/TestApp.app/Contents/MacOS/.empty diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestApp.app/Contents/Resources/.empty b/lldb/test/API/macosx/find-app-in-bundle/TestApp.app/Contents/Resources/.empty rename from lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestApp.app/Contents/Resources/.empty rename to lldb/test/API/macosx/find-app-in-bundle/TestApp.app/Contents/Resources/.empty diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestFindAppInBundle.py b/lldb/test/API/macosx/find-app-in-bundle/TestFindAppInBundle.py rename from lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/TestFindAppInBundle.py rename to lldb/test/API/macosx/find-app-in-bundle/TestFindAppInBundle.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/main.c b/lldb/test/API/macosx/find-app-in-bundle/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/main.c rename to lldb/test/API/macosx/find-app-in-bundle/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile b/lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile rename to lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py b/lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py rename to lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/bundle.c b/lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/bundle.c rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/bundle.c rename to lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/bundle.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/main.c b/lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/main.c rename to lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Info.plist b/lldb/test/API/macosx/find-dsym/deep-bundle/Info.plist rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Info.plist rename to lldb/test/API/macosx/find-dsym/deep-bundle/Info.plist diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile b/lldb/test/API/macosx/find-dsym/deep-bundle/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile rename to lldb/test/API/macosx/find-dsym/deep-bundle/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/MyFramework.h b/lldb/test/API/macosx/find-dsym/deep-bundle/MyFramework.h rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/MyFramework.h rename to lldb/test/API/macosx/find-dsym/deep-bundle/MyFramework.h diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py b/lldb/test/API/macosx/find-dsym/deep-bundle/TestDeepBundle.py rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py rename to lldb/test/API/macosx/find-dsym/deep-bundle/TestDeepBundle.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c b/lldb/test/API/macosx/find-dsym/deep-bundle/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c rename to lldb/test/API/macosx/find-dsym/deep-bundle/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/myframework.c b/lldb/test/API/macosx/find-dsym/deep-bundle/myframework.c rename from lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/myframework.c rename to lldb/test/API/macosx/find-dsym/deep-bundle/myframework.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile b/lldb/test/API/macosx/function-starts/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile rename to lldb/test/API/macosx/function-starts/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/function-starts/TestFunctionStarts.py b/lldb/test/API/macosx/function-starts/TestFunctionStarts.py rename from lldb/packages/Python/lldbsuite/test/macosx/function-starts/TestFunctionStarts.py rename to lldb/test/API/macosx/function-starts/TestFunctionStarts.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/function-starts/main.cpp b/lldb/test/API/macosx/function-starts/main.cpp rename from lldb/packages/Python/lldbsuite/test/macosx/function-starts/main.cpp rename to lldb/test/API/macosx/function-starts/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile b/lldb/test/API/macosx/indirect_symbol/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile rename to lldb/test/API/macosx/indirect_symbol/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py b/lldb/test/API/macosx/indirect_symbol/TestIndirectSymbols.py rename from lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py rename to lldb/test/API/macosx/indirect_symbol/TestIndirectSymbols.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/alias.list b/lldb/test/API/macosx/indirect_symbol/alias.list rename from lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/alias.list rename to lldb/test/API/macosx/indirect_symbol/alias.list diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/indirect.c b/lldb/test/API/macosx/indirect_symbol/indirect.c rename from lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/indirect.c rename to lldb/test/API/macosx/indirect_symbol/indirect.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/main.c b/lldb/test/API/macosx/indirect_symbol/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/main.c rename to lldb/test/API/macosx/indirect_symbol/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/reexport.c b/lldb/test/API/macosx/indirect_symbol/reexport.c rename from lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/reexport.c rename to lldb/test/API/macosx/indirect_symbol/reexport.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile b/lldb/test/API/macosx/lc-note/kern-ver-str/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile rename to lldb/test/API/macosx/lc-note/kern-ver-str/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/TestKernVerStrLCNOTE.py b/lldb/test/API/macosx/lc-note/kern-ver-str/TestKernVerStrLCNOTE.py rename from lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/TestKernVerStrLCNOTE.py rename to lldb/test/API/macosx/lc-note/kern-ver-str/TestKernVerStrLCNOTE.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.cpp b/lldb/test/API/macosx/lc-note/kern-ver-str/create-empty-corefile.cpp rename from lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.cpp rename to lldb/test/API/macosx/lc-note/kern-ver-str/create-empty-corefile.cpp diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/main.c b/lldb/test/API/macosx/lc-note/kern-ver-str/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/main.c rename to lldb/test/API/macosx/lc-note/kern-ver-str/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/load-kext/TestLoadKext.py b/lldb/test/API/macosx/load-kext/TestLoadKext.py rename from lldb/packages/Python/lldbsuite/test/macosx/load-kext/TestLoadKext.py rename to lldb/test/API/macosx/load-kext/TestLoadKext.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/load-kext/mykext.yaml b/lldb/test/API/macosx/load-kext/mykext.yaml rename from lldb/packages/Python/lldbsuite/test/macosx/load-kext/mykext.yaml rename to lldb/test/API/macosx/load-kext/mykext.yaml diff --git a/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile b/lldb/test/API/macosx/macabi/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile rename to lldb/test/API/macosx/macabi/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/macabi/TestMacABImacOSFramework.py b/lldb/test/API/macosx/macabi/TestMacABImacOSFramework.py rename from lldb/packages/Python/lldbsuite/test/macosx/macabi/TestMacABImacOSFramework.py rename to lldb/test/API/macosx/macabi/TestMacABImacOSFramework.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/macabi/foo.h b/lldb/test/API/macosx/macabi/foo.h rename from lldb/packages/Python/lldbsuite/test/macosx/macabi/foo.h rename to lldb/test/API/macosx/macabi/foo.h diff --git a/lldb/packages/Python/lldbsuite/test/macosx/macabi/foo.c b/lldb/test/API/macosx/macabi/foo.c rename from lldb/packages/Python/lldbsuite/test/macosx/macabi/foo.c rename to lldb/test/API/macosx/macabi/foo.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/macabi/main.c b/lldb/test/API/macosx/macabi/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/macabi/main.c rename to lldb/test/API/macosx/macabi/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/nslog/Makefile b/lldb/test/API/macosx/nslog/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/nslog/Makefile rename to lldb/test/API/macosx/nslog/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py b/lldb/test/API/macosx/nslog/TestDarwinNSLogOutput.py rename from lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py rename to lldb/test/API/macosx/nslog/TestDarwinNSLogOutput.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/nslog/main.m b/lldb/test/API/macosx/nslog/main.m rename from lldb/packages/Python/lldbsuite/test/macosx/nslog/main.m rename to lldb/test/API/macosx/nslog/main.m diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile b/lldb/test/API/macosx/order/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/order/Makefile rename to lldb/test/API/macosx/order/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py b/lldb/test/API/macosx/order/TestOrderFile.py rename from lldb/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py rename to lldb/test/API/macosx/order/TestOrderFile.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/cmds.txt b/lldb/test/API/macosx/order/cmds.txt rename from lldb/packages/Python/lldbsuite/test/macosx/order/cmds.txt rename to lldb/test/API/macosx/order/cmds.txt diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/main.c b/lldb/test/API/macosx/order/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/order/main.c rename to lldb/test/API/macosx/order/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/order-file b/lldb/test/API/macosx/order/order-file rename from lldb/packages/Python/lldbsuite/test/macosx/order/order-file rename to lldb/test/API/macosx/order/order-file diff --git a/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile b/lldb/test/API/macosx/queues/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile rename to lldb/test/API/macosx/queues/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py b/lldb/test/API/macosx/queues/TestQueues.py rename from lldb/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py rename to lldb/test/API/macosx/queues/TestQueues.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/queues/main.c b/lldb/test/API/macosx/queues/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/queues/main.c rename to lldb/test/API/macosx/queues/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile b/lldb/test/API/macosx/safe-to-func-call/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile rename to lldb/test/API/macosx/safe-to-func-call/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py b/lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py rename from lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py rename to lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/main.c b/lldb/test/API/macosx/safe-to-func-call/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/main.c rename to lldb/test/API/macosx/safe-to-func-call/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile b/lldb/test/API/macosx/thread-names/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile rename to lldb/test/API/macosx/thread-names/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/thread-names/TestInterruptThreadNames.py b/lldb/test/API/macosx/thread-names/TestInterruptThreadNames.py rename from lldb/packages/Python/lldbsuite/test/macosx/thread-names/TestInterruptThreadNames.py rename to lldb/test/API/macosx/thread-names/TestInterruptThreadNames.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/thread-names/main.c b/lldb/test/API/macosx/thread-names/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/thread-names/main.c rename to lldb/test/API/macosx/thread-names/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile b/lldb/test/API/macosx/universal/Makefile rename from lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile rename to lldb/test/API/macosx/universal/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py b/lldb/test/API/macosx/universal/TestUniversal.py rename from lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py rename to lldb/test/API/macosx/universal/TestUniversal.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/universal/main.c b/lldb/test/API/macosx/universal/main.c rename from lldb/packages/Python/lldbsuite/test/macosx/universal/main.c rename to lldb/test/API/macosx/universal/main.c diff --git a/lldb/packages/Python/lldbsuite/test/macosx/version_zero/TestGetVersionZeroVersion.py b/lldb/test/API/macosx/version_zero/TestGetVersionZeroVersion.py rename from lldb/packages/Python/lldbsuite/test/macosx/version_zero/TestGetVersionZeroVersion.py rename to lldb/test/API/macosx/version_zero/TestGetVersionZeroVersion.py diff --git a/lldb/packages/Python/lldbsuite/test/macosx/version_zero/libDylib.dylib.yaml b/lldb/test/API/macosx/version_zero/libDylib.dylib.yaml rename from lldb/packages/Python/lldbsuite/test/macosx/version_zero/libDylib.dylib.yaml rename to lldb/test/API/macosx/version_zero/libDylib.dylib.yaml diff --git a/lldb/packages/Python/lldbsuite/test/python_api/.categories b/lldb/test/API/python_api/.categories rename from lldb/packages/Python/lldbsuite/test/python_api/.categories rename to lldb/test/API/python_api/.categories diff --git a/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile b/lldb/test/API/python_api/breakpoint/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile rename to lldb/test/API/python_api/breakpoint/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py b/lldb/test/API/python_api/breakpoint/TestBreakpointAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py rename to lldb/test/API/python_api/breakpoint/TestBreakpointAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/main.c b/lldb/test/API/python_api/breakpoint/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/breakpoint/main.c rename to lldb/test/API/python_api/breakpoint/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/class_members/Makefile b/lldb/test/API/python_api/class_members/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/class_members/Makefile rename to lldb/test/API/python_api/class_members/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py b/lldb/test/API/python_api/class_members/TestSBTypeClassMembers.py rename from lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py rename to lldb/test/API/python_api/class_members/TestSBTypeClassMembers.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/class_members/main.mm b/lldb/test/API/python_api/class_members/main.mm rename from lldb/packages/Python/lldbsuite/test/python_api/class_members/main.mm rename to lldb/test/API/python_api/class_members/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py b/lldb/test/API/python_api/debugger/TestDebuggerAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py rename to lldb/test/API/python_api/debugger/TestDebuggerAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py b/lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py rename to lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_address.py b/lldb/test/API/python_api/default-constructor/sb_address.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_address.py rename to lldb/test/API/python_api/default-constructor/sb_address.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_block.py b/lldb/test/API/python_api/default-constructor/sb_block.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_block.py rename to lldb/test/API/python_api/default-constructor/sb_block.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpoint.py b/lldb/test/API/python_api/default-constructor/sb_breakpoint.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpoint.py rename to lldb/test/API/python_api/default-constructor/sb_breakpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpointlocation.py b/lldb/test/API/python_api/default-constructor/sb_breakpointlocation.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpointlocation.py rename to lldb/test/API/python_api/default-constructor/sb_breakpointlocation.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpointname.py b/lldb/test/API/python_api/default-constructor/sb_breakpointname.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpointname.py rename to lldb/test/API/python_api/default-constructor/sb_breakpointname.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_broadcaster.py b/lldb/test/API/python_api/default-constructor/sb_broadcaster.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_broadcaster.py rename to lldb/test/API/python_api/default-constructor/sb_broadcaster.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_communication.py b/lldb/test/API/python_api/default-constructor/sb_communication.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_communication.py rename to lldb/test/API/python_api/default-constructor/sb_communication.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_compileunit.py b/lldb/test/API/python_api/default-constructor/sb_compileunit.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_compileunit.py rename to lldb/test/API/python_api/default-constructor/sb_compileunit.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_debugger.py b/lldb/test/API/python_api/default-constructor/sb_debugger.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_debugger.py rename to lldb/test/API/python_api/default-constructor/sb_debugger.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_error.py b/lldb/test/API/python_api/default-constructor/sb_error.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_error.py rename to lldb/test/API/python_api/default-constructor/sb_error.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_event.py b/lldb/test/API/python_api/default-constructor/sb_event.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_event.py rename to lldb/test/API/python_api/default-constructor/sb_event.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_filespec.py b/lldb/test/API/python_api/default-constructor/sb_filespec.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_filespec.py rename to lldb/test/API/python_api/default-constructor/sb_filespec.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_frame.py b/lldb/test/API/python_api/default-constructor/sb_frame.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_frame.py rename to lldb/test/API/python_api/default-constructor/sb_frame.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_function.py b/lldb/test/API/python_api/default-constructor/sb_function.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_function.py rename to lldb/test/API/python_api/default-constructor/sb_function.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_instruction.py b/lldb/test/API/python_api/default-constructor/sb_instruction.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_instruction.py rename to lldb/test/API/python_api/default-constructor/sb_instruction.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_instructionlist.py b/lldb/test/API/python_api/default-constructor/sb_instructionlist.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_instructionlist.py rename to lldb/test/API/python_api/default-constructor/sb_instructionlist.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_lineentry.py b/lldb/test/API/python_api/default-constructor/sb_lineentry.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_lineentry.py rename to lldb/test/API/python_api/default-constructor/sb_lineentry.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_listener.py b/lldb/test/API/python_api/default-constructor/sb_listener.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_listener.py rename to lldb/test/API/python_api/default-constructor/sb_listener.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_module.py b/lldb/test/API/python_api/default-constructor/sb_module.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_module.py rename to lldb/test/API/python_api/default-constructor/sb_module.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_process.py b/lldb/test/API/python_api/default-constructor/sb_process.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_process.py rename to lldb/test/API/python_api/default-constructor/sb_process.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_process_info.py b/lldb/test/API/python_api/default-constructor/sb_process_info.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_process_info.py rename to lldb/test/API/python_api/default-constructor/sb_process_info.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_section.py b/lldb/test/API/python_api/default-constructor/sb_section.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_section.py rename to lldb/test/API/python_api/default-constructor/sb_section.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_stringlist.py b/lldb/test/API/python_api/default-constructor/sb_stringlist.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_stringlist.py rename to lldb/test/API/python_api/default-constructor/sb_stringlist.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_symbol.py b/lldb/test/API/python_api/default-constructor/sb_symbol.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_symbol.py rename to lldb/test/API/python_api/default-constructor/sb_symbol.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_symbolcontext.py b/lldb/test/API/python_api/default-constructor/sb_symbolcontext.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_symbolcontext.py rename to lldb/test/API/python_api/default-constructor/sb_symbolcontext.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_target.py b/lldb/test/API/python_api/default-constructor/sb_target.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_target.py rename to lldb/test/API/python_api/default-constructor/sb_target.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_thread.py b/lldb/test/API/python_api/default-constructor/sb_thread.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_thread.py rename to lldb/test/API/python_api/default-constructor/sb_thread.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_type.py b/lldb/test/API/python_api/default-constructor/sb_type.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_type.py rename to lldb/test/API/python_api/default-constructor/sb_type.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_value.py b/lldb/test/API/python_api/default-constructor/sb_value.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_value.py rename to lldb/test/API/python_api/default-constructor/sb_value.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_valuelist.py b/lldb/test/API/python_api/default-constructor/sb_valuelist.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_valuelist.py rename to lldb/test/API/python_api/default-constructor/sb_valuelist.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_watchpoint.py b/lldb/test/API/python_api/default-constructor/sb_watchpoint.py rename from lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_watchpoint.py rename to lldb/test/API/python_api/default-constructor/sb_watchpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py b/lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py rename from lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py rename to lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py rename from lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py rename to lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/event/Makefile b/lldb/test/API/python_api/event/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/event/Makefile rename to lldb/test/API/python_api/event/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py b/lldb/test/API/python_api/event/TestEvents.py rename from lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py rename to lldb/test/API/python_api/event/TestEvents.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/event/main.c b/lldb/test/API/python_api/event/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/event/main.c rename to lldb/test/API/python_api/event/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py b/lldb/test/API/python_api/exprpath_synthetic/TestExprPathSynthetic.py rename from lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py rename to lldb/test/API/python_api/exprpath_synthetic/TestExprPathSynthetic.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/main.mm b/lldb/test/API/python_api/exprpath_synthetic/main.mm rename from lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/main.mm rename to lldb/test/API/python_api/exprpath_synthetic/main.mm diff --git a/lldb/packages/Python/lldbsuite/test/python_api/file_handle/TestFileHandle.py b/lldb/test/API/python_api/file_handle/TestFileHandle.py rename from lldb/packages/Python/lldbsuite/test/python_api/file_handle/TestFileHandle.py rename to lldb/test/API/python_api/file_handle/TestFileHandle.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile b/lldb/test/API/python_api/findvalue_duplist/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile rename to lldb/test/API/python_api/findvalue_duplist/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py b/lldb/test/API/python_api/findvalue_duplist/TestSBFrameFindValue.py rename from lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py rename to lldb/test/API/python_api/findvalue_duplist/TestSBFrameFindValue.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/main.cpp b/lldb/test/API/python_api/findvalue_duplist/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/main.cpp rename to lldb/test/API/python_api/findvalue_duplist/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/formatters/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/formatters/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py b/lldb/test/API/python_api/formatters/TestFormattersSBAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py rename to lldb/test/API/python_api/formatters/TestFormattersSBAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/formatters/main.cpp b/lldb/test/API/python_api/formatters/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/formatters/main.cpp rename to lldb/test/API/python_api/formatters/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/formatters/synth.py b/lldb/test/API/python_api/formatters/synth.py rename from lldb/packages/Python/lldbsuite/test/python_api/formatters/synth.py rename to lldb/test/API/python_api/formatters/synth.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/Makefile b/lldb/test/API/python_api/frame/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/frame/Makefile rename to lldb/test/API/python_api/frame/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py b/lldb/test/API/python_api/frame/TestFrames.py rename from lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py rename to lldb/test/API/python_api/frame/TestFrames.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/Makefile b/lldb/test/API/python_api/frame/get-variables/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/Makefile rename to lldb/test/API/python_api/frame/get-variables/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/TestGetVariables.py b/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py rename from lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/TestGetVariables.py rename to lldb/test/API/python_api/frame/get-variables/TestGetVariables.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/main.c b/lldb/test/API/python_api/frame/get-variables/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/main.c rename to lldb/test/API/python_api/frame/get-variables/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile b/lldb/test/API/python_api/frame/inlines/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile rename to lldb/test/API/python_api/frame/inlines/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py b/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py rename from lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py rename to lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/inlines.h b/lldb/test/API/python_api/frame/inlines/inlines.h rename from lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/inlines.h rename to lldb/test/API/python_api/frame/inlines/inlines.h diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/inlines.c b/lldb/test/API/python_api/frame/inlines/inlines.c rename from lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/inlines.c rename to lldb/test/API/python_api/frame/inlines/inlines.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/main.c b/lldb/test/API/python_api/frame/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/frame/main.c rename to lldb/test/API/python_api/frame/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile b/lldb/test/API/python_api/function_symbol/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile rename to lldb/test/API/python_api/function_symbol/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py b/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py rename to lldb/test/API/python_api/function_symbol/TestDisasmAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py b/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py rename to lldb/test/API/python_api/function_symbol/TestSymbolAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/main.c b/lldb/test/API/python_api/function_symbol/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/function_symbol/main.c rename to lldb/test/API/python_api/function_symbol/main.c diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/get-value-32bit-int/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/get-value-32bit-int/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/get-value-32bit-int/TestGetValue32BitInt.py b/lldb/test/API/python_api/get-value-32bit-int/TestGetValue32BitInt.py rename from lldb/packages/Python/lldbsuite/test/python_api/get-value-32bit-int/TestGetValue32BitInt.py rename to lldb/test/API/python_api/get-value-32bit-int/TestGetValue32BitInt.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/get-value-32bit-int/main.cpp b/lldb/test/API/python_api/get-value-32bit-int/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/get-value-32bit-int/main.cpp rename to lldb/test/API/python_api/get-value-32bit-int/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/Makefile b/lldb/test/API/python_api/hello_world/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/hello_world/Makefile rename to lldb/test/API/python_api/hello_world/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py b/lldb/test/API/python_api/hello_world/TestHelloWorld.py rename from lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py rename to lldb/test/API/python_api/hello_world/TestHelloWorld.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/main.c b/lldb/test/API/python_api/hello_world/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/hello_world/main.c rename to lldb/test/API/python_api/hello_world/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/interpreter/Makefile b/lldb/test/API/python_api/interpreter/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/interpreter/Makefile rename to lldb/test/API/python_api/interpreter/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py b/lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py rename to lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestRunCommandInterpreterAPI.py b/lldb/test/API/python_api/interpreter/TestRunCommandInterpreterAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestRunCommandInterpreterAPI.py rename to lldb/test/API/python_api/interpreter/TestRunCommandInterpreterAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/interpreter/main.c b/lldb/test/API/python_api/interpreter/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/interpreter/main.c rename to lldb/test/API/python_api/interpreter/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/TestSwigVersion.py b/lldb/test/API/python_api/lldbutil/TestSwigVersion.py rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/TestSwigVersion.py rename to lldb/test/API/python_api/lldbutil/TestSwigVersion.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile b/lldb/test/API/python_api/lldbutil/frame/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile rename to lldb/test/API/python_api/lldbutil/frame/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py rename to lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/main.c b/lldb/test/API/python_api/lldbutil/frame/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/main.c rename to lldb/test/API/python_api/lldbutil/frame/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile b/lldb/test/API/python_api/lldbutil/iter/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile rename to lldb/test/API/python_api/lldbutil/iter/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py rename to lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py rename to lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/main.cpp b/lldb/test/API/python_api/lldbutil/iter/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/main.cpp rename to lldb/test/API/python_api/lldbutil/iter/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile b/lldb/test/API/python_api/lldbutil/process/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile rename to lldb/test/API/python_api/lldbutil/process/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py b/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py rename to lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/main.cpp b/lldb/test/API/python_api/lldbutil/process/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/main.cpp rename to lldb/test/API/python_api/lldbutil/process/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile b/lldb/test/API/python_api/module_section/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile rename to lldb/test/API/python_api/module_section/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py b/lldb/test/API/python_api/module_section/TestModuleAndSection.py rename from lldb/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py rename to lldb/test/API/python_api/module_section/TestModuleAndSection.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/module_section/b.cpp b/lldb/test/API/python_api/module_section/b.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/module_section/b.cpp rename to lldb/test/API/python_api/module_section/b.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/module_section/c.cpp b/lldb/test/API/python_api/module_section/c.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/module_section/c.cpp rename to lldb/test/API/python_api/module_section/c.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/module_section/main.cpp b/lldb/test/API/python_api/module_section/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/module_section/main.cpp rename to lldb/test/API/python_api/module_section/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/name_lookup/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/name_lookup/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/name_lookup/TestNameLookup.py b/lldb/test/API/python_api/name_lookup/TestNameLookup.py rename from lldb/packages/Python/lldbsuite/test/python_api/name_lookup/TestNameLookup.py rename to lldb/test/API/python_api/name_lookup/TestNameLookup.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/name_lookup/main.cpp b/lldb/test/API/python_api/name_lookup/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/name_lookup/main.cpp rename to lldb/test/API/python_api/name_lookup/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile b/lldb/test/API/python_api/objc_type/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile rename to lldb/test/API/python_api/objc_type/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py b/lldb/test/API/python_api/objc_type/TestObjCType.py rename from lldb/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py rename to lldb/test/API/python_api/objc_type/TestObjCType.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/objc_type/main.m b/lldb/test/API/python_api/objc_type/main.m rename from lldb/packages/Python/lldbsuite/test/python_api/objc_type/main.m rename to lldb/test/API/python_api/objc_type/main.m diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/process/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/process/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py b/lldb/test/API/python_api/process/TestProcessAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py rename to lldb/test/API/python_api/process/TestProcessAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/io/Makefile b/lldb/test/API/python_api/process/io/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/process/io/Makefile rename to lldb/test/API/python_api/process/io/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py b/lldb/test/API/python_api/process/io/TestProcessIO.py rename from lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py rename to lldb/test/API/python_api/process/io/TestProcessIO.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/io/main.c b/lldb/test/API/python_api/process/io/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/process/io/main.c rename to lldb/test/API/python_api/process/io/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/main.cpp b/lldb/test/API/python_api/process/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/process/main.cpp rename to lldb/test/API/python_api/process/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/Makefile b/lldb/test/API/python_api/process/read-mem-cstring/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/Makefile rename to lldb/test/API/python_api/process/read-mem-cstring/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/TestReadMemCString.py b/lldb/test/API/python_api/process/read-mem-cstring/TestReadMemCString.py rename from lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/TestReadMemCString.py rename to lldb/test/API/python_api/process/read-mem-cstring/TestReadMemCString.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/main.c b/lldb/test/API/python_api/process/read-mem-cstring/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/main.c rename to lldb/test/API/python_api/process/read-mem-cstring/main.c diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/sbdata/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/sbdata/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py b/lldb/test/API/python_api/sbdata/TestSBData.py rename from lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py rename to lldb/test/API/python_api/sbdata/TestSBData.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbdata/main.cpp b/lldb/test/API/python_api/sbdata/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/sbdata/main.cpp rename to lldb/test/API/python_api/sbdata/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sblaunchinfo/TestSBLaunchInfo.py b/lldb/test/API/python_api/sblaunchinfo/TestSBLaunchInfo.py rename from lldb/packages/Python/lldbsuite/test/python_api/sblaunchinfo/TestSBLaunchInfo.py rename to lldb/test/API/python_api/sblaunchinfo/TestSBLaunchInfo.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbstructureddata/TestStructuredDataAPI.py b/lldb/test/API/python_api/sbstructureddata/TestStructuredDataAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/sbstructureddata/TestStructuredDataAPI.py rename to lldb/test/API/python_api/sbstructureddata/TestStructuredDataAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py b/lldb/test/API/python_api/sbtype_typeclass/TestSBTypeTypeClass.py rename from lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py rename to lldb/test/API/python_api/sbtype_typeclass/TestSBTypeTypeClass.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/main.m b/lldb/test/API/python_api/sbtype_typeclass/main.m rename from lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/main.m rename to lldb/test/API/python_api/sbtype_typeclass/main.m diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py b/lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py rename from lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py rename to lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/main.cpp b/lldb/test/API/python_api/sbvalue_const_addrof/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/main.cpp rename to lldb/test/API/python_api/sbvalue_const_addrof/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/sbvalue_persist/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/sbvalue_persist/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py b/lldb/test/API/python_api/sbvalue_persist/TestSBValuePersist.py rename from lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py rename to lldb/test/API/python_api/sbvalue_persist/TestSBValuePersist.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/main.cpp b/lldb/test/API/python_api/sbvalue_persist/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/main.cpp rename to lldb/test/API/python_api/sbvalue_persist/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/section/Makefile b/lldb/test/API/python_api/section/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/section/Makefile rename to lldb/test/API/python_api/section/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py b/lldb/test/API/python_api/section/TestSectionAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py rename to lldb/test/API/python_api/section/TestSectionAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/section/main.c b/lldb/test/API/python_api/section/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/section/main.c rename to lldb/test/API/python_api/section/main.c diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/signals/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/signals/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py b/lldb/test/API/python_api/signals/TestSignalsAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py rename to lldb/test/API/python_api/signals/TestSignalsAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/signals/main.cpp b/lldb/test/API/python_api/signals/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/signals/main.cpp rename to lldb/test/API/python_api/signals/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile b/lldb/test/API/python_api/symbol-context/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile rename to lldb/test/API/python_api/symbol-context/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py b/lldb/test/API/python_api/symbol-context/TestSymbolContext.py rename from lldb/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py rename to lldb/test/API/python_api/symbol-context/TestSymbolContext.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/main.c b/lldb/test/API/python_api/symbol-context/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/symbol-context/main.c rename to lldb/test/API/python_api/symbol-context/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/Makefile b/lldb/test/API/python_api/symbol-context/two-files/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/Makefile rename to lldb/test/API/python_api/symbol-context/two-files/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py b/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py rename from lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py rename to lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/decls.h b/lldb/test/API/python_api/symbol-context/two-files/decls.h rename from lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/decls.h rename to lldb/test/API/python_api/symbol-context/two-files/decls.h diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/file1.cpp b/lldb/test/API/python_api/symbol-context/two-files/file1.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/file1.cpp rename to lldb/test/API/python_api/symbol-context/two-files/file1.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/file2.cpp b/lldb/test/API/python_api/symbol-context/two-files/file2.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/file2.cpp rename to lldb/test/API/python_api/symbol-context/two-files/file2.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/target/Makefile b/lldb/test/API/python_api/target/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/target/Makefile rename to lldb/test/API/python_api/target/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py b/lldb/test/API/python_api/target/TestTargetAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py rename to lldb/test/API/python_api/target/TestTargetAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/target/main.c b/lldb/test/API/python_api/target/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/target/main.c rename to lldb/test/API/python_api/target/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/thread/Makefile b/lldb/test/API/python_api/thread/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/thread/Makefile rename to lldb/test/API/python_api/thread/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py b/lldb/test/API/python_api/thread/TestThreadAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py rename to lldb/test/API/python_api/thread/TestThreadAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/thread/main.cpp b/lldb/test/API/python_api/thread/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/thread/main.cpp rename to lldb/test/API/python_api/thread/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/thread/main2.cpp b/lldb/test/API/python_api/thread/main2.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/thread/main2.cpp rename to lldb/test/API/python_api/thread/main2.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/type/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/type/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py b/lldb/test/API/python_api/type/TestTypeList.py rename from lldb/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py rename to lldb/test/API/python_api/type/TestTypeList.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/type/main.cpp b/lldb/test/API/python_api/type/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/type/main.cpp rename to lldb/test/API/python_api/type/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/Makefile b/lldb/test/API/python_api/value/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/value/Makefile rename to lldb/test/API/python_api/value/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py b/lldb/test/API/python_api/value/TestValueAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py rename to lldb/test/API/python_api/value/TestValueAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile b/lldb/test/API/python_api/value/change_values/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile rename to lldb/test/API/python_api/value/change_values/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py b/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py rename to lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/main.c b/lldb/test/API/python_api/value/change_values/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/value/change_values/main.c rename to lldb/test/API/python_api/value/change_values/main.c diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/value/empty_class/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/value/empty_class/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/TestValueAPIEmptyClass.py b/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py rename from lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/TestValueAPIEmptyClass.py rename to lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/main.cpp b/lldb/test/API/python_api/value/empty_class/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/main.cpp rename to lldb/test/API/python_api/value/empty_class/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/value/linked_list/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/value/linked_list/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py b/lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py rename from lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py rename to lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/main.cpp b/lldb/test/API/python_api/value/linked_list/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/main.cpp rename to lldb/test/API/python_api/value/linked_list/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/main.c b/lldb/test/API/python_api/value/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/value/main.c rename to lldb/test/API/python_api/value/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile b/lldb/test/API/python_api/value_var_update/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile rename to lldb/test/API/python_api/value_var_update/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py b/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py rename from lldb/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py rename to lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/main.c b/lldb/test/API/python_api/value_var_update/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/value_var_update/main.c rename to lldb/test/API/python_api/value_var_update/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/.categories b/lldb/test/API/python_api/watchpoint/.categories rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/.categories rename to lldb/test/API/python_api/watchpoint/.categories diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile b/lldb/test/API/python_api/watchpoint/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile rename to lldb/test/API/python_api/watchpoint/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py b/lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py rename to lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py b/lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py rename to lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py b/lldb/test/API/python_api/watchpoint/TestWatchpointIter.py rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py rename to lldb/test/API/python_api/watchpoint/TestWatchpointIter.py diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/python_api/watchpoint/condition/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/python_api/watchpoint/condition/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py b/lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py rename to lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/main.cpp b/lldb/test/API/python_api/watchpoint/condition/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/main.cpp rename to lldb/test/API/python_api/watchpoint/condition/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/main.c b/lldb/test/API/python_api/watchpoint/main.c rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/main.c rename to lldb/test/API/python_api/watchpoint/main.c diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile b/lldb/test/API/python_api/watchpoint/watchlocation/Makefile rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile rename to lldb/test/API/python_api/watchpoint/watchlocation/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py b/lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py rename to lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py rename to lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/main.cpp b/lldb/test/API/python_api/watchpoint/watchlocation/main.cpp rename from lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/main.cpp rename to lldb/test/API/python_api/watchpoint/watchlocation/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/sample_test/Makefile b/lldb/test/API/sample_test/Makefile rename from lldb/packages/Python/lldbsuite/test/sample_test/Makefile rename to lldb/test/API/sample_test/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/sample_test/TestSampleInlineTest.py b/lldb/test/API/sample_test/TestSampleInlineTest.py rename from lldb/packages/Python/lldbsuite/test/sample_test/TestSampleInlineTest.py rename to lldb/test/API/sample_test/TestSampleInlineTest.py diff --git a/lldb/packages/Python/lldbsuite/test/sample_test/TestSampleTest.py b/lldb/test/API/sample_test/TestSampleTest.py rename from lldb/packages/Python/lldbsuite/test/sample_test/TestSampleTest.py rename to lldb/test/API/sample_test/TestSampleTest.py diff --git a/lldb/packages/Python/lldbsuite/test/sample_test/main.c b/lldb/test/API/sample_test/main.c rename from lldb/packages/Python/lldbsuite/test/sample_test/main.c rename to lldb/test/API/sample_test/main.c diff --git a/lldb/packages/Python/lldbsuite/test/sanity/TestModuleCacheSanity.py b/lldb/test/API/sanity/TestModuleCacheSanity.py rename from lldb/packages/Python/lldbsuite/test/sanity/TestModuleCacheSanity.py rename to lldb/test/API/sanity/TestModuleCacheSanity.py diff --git a/lldb/packages/Python/lldbsuite/test/source-manager/Makefile b/lldb/test/API/source-manager/Makefile rename from lldb/packages/Python/lldbsuite/test/source-manager/Makefile rename to lldb/test/API/source-manager/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py b/lldb/test/API/source-manager/TestSourceManager.py rename from lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py rename to lldb/test/API/source-manager/TestSourceManager.py diff --git a/lldb/packages/Python/lldbsuite/test/source-manager/hidden/.keep b/lldb/test/API/source-manager/hidden/.keep rename from lldb/packages/Python/lldbsuite/test/source-manager/hidden/.keep rename to lldb/test/API/source-manager/hidden/.keep diff --git a/lldb/packages/Python/lldbsuite/test/source-manager/main.c b/lldb/test/API/source-manager/main.c rename from lldb/packages/Python/lldbsuite/test/source-manager/main.c rename to lldb/test/API/source-manager/main.c diff --git a/lldb/packages/Python/lldbsuite/test/terminal/TestEditline.py b/lldb/test/API/terminal/TestEditline.py rename from lldb/packages/Python/lldbsuite/test/terminal/TestEditline.py rename to lldb/test/API/terminal/TestEditline.py diff --git a/lldb/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py b/lldb/test/API/terminal/TestSTTYBeforeAndAfter.py rename from lldb/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py rename to lldb/test/API/terminal/TestSTTYBeforeAndAfter.py diff --git a/lldb/packages/Python/lldbsuite/test/test_runner/test/__init__.py b/lldb/test/API/test_runner/test/__init__.py rename from lldb/packages/Python/lldbsuite/test/test_runner/test/__init__.py rename to lldb/test/API/test_runner/test/__init__.py diff --git a/lldb/packages/Python/lldbsuite/test/test_runner/test/inferior.py b/lldb/test/API/test_runner/test/inferior.py rename from lldb/packages/Python/lldbsuite/test/test_runner/test/inferior.py rename to lldb/test/API/test_runner/test/inferior.py diff --git a/lldb/packages/Python/lldbsuite/test/test_runner/test/test_process_control.py b/lldb/test/API/test_runner/test/test_process_control.py rename from lldb/packages/Python/lldbsuite/test/test_runner/test/test_process_control.py rename to lldb/test/API/test_runner/test/test_process_control.py diff --git a/lldb/test/API/testcases b/lldb/test/API/testcases deleted file mode 120000 --- a/lldb/test/API/testcases +++ /dev/null @@ -1 +0,0 @@ -../../packages/Python/lldbsuite/test \ No newline at end of file diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/.clang-format b/lldb/test/API/tools/lldb-server/.clang-format rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/.clang-format rename to lldb/test/API/tools/lldb-server/.clang-format diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile b/lldb/test/API/tools/lldb-server/Makefile rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile rename to lldb/test/API/tools/lldb-server/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py rename to lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExitCode.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExitCode.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteHostInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteHostInfo.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteModuleInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteModuleInfo.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py rename to lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py rename to lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py rename to lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vContThreads.py b/lldb/test/API/tools/lldb-server/TestGdbRemote_vContThreads.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vContThreads.py rename to lldb/test/API/tools/lldb-server/TestGdbRemote_vContThreads.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py rename to lldb/test/API/tools/lldb-server/TestLldbGdbServer.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py b/lldb/test/API/tools/lldb-server/commandline/TestStubReverseConnect.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py rename to lldb/test/API/tools/lldb-server/commandline/TestStubReverseConnect.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py rename to lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile b/lldb/test/API/tools/lldb-server/inferior-crash/Makefile rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile rename to lldb/test/API/tools/lldb-server/inferior-crash/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py rename to lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py rename to lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/main.cpp b/lldb/test/API/tools/lldb-server/inferior-crash/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/main.cpp rename to lldb/test/API/tools/lldb-server/inferior-crash/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile b/lldb/test/API/tools/lldb-server/libraries-svr4/Makefile rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile rename to lldb/test/API/tools/lldb-server/libraries-svr4/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py b/lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py rename to lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/main.cpp b/lldb/test/API/tools/lldb-server/libraries-svr4/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/main.cpp rename to lldb/test/API/tools/lldb-server/libraries-svr4/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.cpp b/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_a.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.cpp rename to lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_a.cpp diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp b/lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp rename to lldb/test/API/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/main.cpp b/lldb/test/API/tools/lldb-server/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/main.cpp rename to lldb/test/API/tools/lldb-server/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/tools/lldb-server/platform-process-connect/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/tools/lldb-server/platform-process-connect/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py b/lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py rename to lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/main.cpp b/lldb/test/API/tools/lldb-server/platform-process-connect/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/main.cpp rename to lldb/test/API/tools/lldb-server/platform-process-connect/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/tools/lldb-server/register-reading/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/tools/lldb-server/register-reading/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py b/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py rename to lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/main.cpp b/lldb/test/API/tools/lldb-server/register-reading/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/main.cpp rename to lldb/test/API/tools/lldb-server/register-reading/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/tools/lldb-server/signal-filtering/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/tools/lldb-server/signal-filtering/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py b/lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py rename to lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/main.cpp b/lldb/test/API/tools/lldb-server/signal-filtering/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/main.cpp rename to lldb/test/API/tools/lldb-server/signal-filtering/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/test/test_lldbgdbserverutils.py b/lldb/test/API/tools/lldb-server/test/test_lldbgdbserverutils.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/test/test_lldbgdbserverutils.py rename to lldb/test/API/tools/lldb-server/test/test_lldbgdbserverutils.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/Makefile b/lldb/test/API/tools/lldb-server/thread-name/Makefile rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/Makefile rename to lldb/test/API/tools/lldb-server/thread-name/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py b/lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py rename to lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/main.cpp b/lldb/test/API/tools/lldb-server/thread-name/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/main.cpp rename to lldb/test/API/tools/lldb-server/thread-name/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/.categories b/lldb/test/API/tools/lldb-vscode/.categories rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/.categories rename to lldb/test/API/tools/lldb-vscode/.categories diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/Makefile b/lldb/test/API/tools/lldb-vscode/attach/Makefile rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/Makefile rename to lldb/test/API/tools/lldb-vscode/attach/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/TestVSCode_attach.py b/lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/TestVSCode_attach.py rename to lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/main.c b/lldb/test/API/tools/lldb-vscode/attach/main.c rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/main.c rename to lldb/test/API/tools/lldb-vscode/attach/main.c diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/tools/lldb-vscode/breakpoint/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/tools/lldb-vscode/breakpoint/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py rename to lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py rename to lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py rename to lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/main.cpp b/lldb/test/API/tools/lldb-vscode/breakpoint/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/main.cpp rename to lldb/test/API/tools/lldb-vscode/breakpoint/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/tools/lldb-vscode/completions/Makefile copy from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile copy to lldb/test/API/tools/lldb-vscode/completions/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/completions/TestVSCode_completions.py b/lldb/test/API/tools/lldb-vscode/completions/TestVSCode_completions.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/completions/TestVSCode_completions.py rename to lldb/test/API/tools/lldb-vscode/completions/TestVSCode_completions.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/completions/main.cpp b/lldb/test/API/tools/lldb-vscode/completions/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/completions/main.cpp rename to lldb/test/API/tools/lldb-vscode/completions/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/Makefile b/lldb/test/API/tools/lldb-vscode/launch/Makefile rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/Makefile rename to lldb/test/API/tools/lldb-vscode/launch/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py b/lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py rename to lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/main.c b/lldb/test/API/tools/lldb-vscode/launch/main.c rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/main.c rename to lldb/test/API/tools/lldb-vscode/launch/main.c diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile b/lldb/test/API/tools/lldb-vscode/stackTrace/Makefile rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile rename to lldb/test/API/tools/lldb-vscode/stackTrace/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py b/lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py rename to lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/main.c b/lldb/test/API/tools/lldb-vscode/stackTrace/main.c rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/main.c rename to lldb/test/API/tools/lldb-vscode/stackTrace/main.c diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/Makefile b/lldb/test/API/tools/lldb-vscode/step/Makefile rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/Makefile rename to lldb/test/API/tools/lldb-vscode/step/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/TestVSCode_step.py b/lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/TestVSCode_step.py rename to lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/main.cpp b/lldb/test/API/tools/lldb-vscode/step/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/main.cpp rename to lldb/test/API/tools/lldb-vscode/step/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/test/API/tools/lldb-vscode/variables/Makefile rename from lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile rename to lldb/test/API/tools/lldb-vscode/variables/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/TestVSCode_variables.py b/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/TestVSCode_variables.py rename to lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/main.cpp b/lldb/test/API/tools/lldb-vscode/variables/main.cpp rename from lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/main.cpp rename to lldb/test/API/tools/lldb-vscode/variables/main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/AbstractBase.py b/lldb/test/API/types/AbstractBase.py rename from lldb/packages/Python/lldbsuite/test/types/AbstractBase.py rename to lldb/test/API/types/AbstractBase.py diff --git a/lldb/packages/Python/lldbsuite/test/types/HideTestFailures.py b/lldb/test/API/types/HideTestFailures.py rename from lldb/packages/Python/lldbsuite/test/types/HideTestFailures.py rename to lldb/test/API/types/HideTestFailures.py diff --git a/lldb/packages/Python/lldbsuite/test/types/Makefile b/lldb/test/API/types/Makefile rename from lldb/packages/Python/lldbsuite/test/types/Makefile rename to lldb/test/API/types/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/types/TestCharType.py b/lldb/test/API/types/TestCharType.py rename from lldb/packages/Python/lldbsuite/test/types/TestCharType.py rename to lldb/test/API/types/TestCharType.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestCharTypeExpr.py b/lldb/test/API/types/TestCharTypeExpr.py rename from lldb/packages/Python/lldbsuite/test/types/TestCharTypeExpr.py rename to lldb/test/API/types/TestCharTypeExpr.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestDoubleTypes.py b/lldb/test/API/types/TestDoubleTypes.py rename from lldb/packages/Python/lldbsuite/test/types/TestDoubleTypes.py rename to lldb/test/API/types/TestDoubleTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestDoubleTypesExpr.py b/lldb/test/API/types/TestDoubleTypesExpr.py rename from lldb/packages/Python/lldbsuite/test/types/TestDoubleTypesExpr.py rename to lldb/test/API/types/TestDoubleTypesExpr.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestFloatTypes.py b/lldb/test/API/types/TestFloatTypes.py rename from lldb/packages/Python/lldbsuite/test/types/TestFloatTypes.py rename to lldb/test/API/types/TestFloatTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py b/lldb/test/API/types/TestFloatTypesExpr.py rename from lldb/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py rename to lldb/test/API/types/TestFloatTypesExpr.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestIntegerType.py b/lldb/test/API/types/TestIntegerType.py rename from lldb/packages/Python/lldbsuite/test/types/TestIntegerType.py rename to lldb/test/API/types/TestIntegerType.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypeExpr.py b/lldb/test/API/types/TestIntegerTypeExpr.py rename from lldb/packages/Python/lldbsuite/test/types/TestIntegerTypeExpr.py rename to lldb/test/API/types/TestIntegerTypeExpr.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestLongTypes.py b/lldb/test/API/types/TestLongTypes.py rename from lldb/packages/Python/lldbsuite/test/types/TestLongTypes.py rename to lldb/test/API/types/TestLongTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestLongTypesExpr.py b/lldb/test/API/types/TestLongTypesExpr.py rename from lldb/packages/Python/lldbsuite/test/types/TestLongTypesExpr.py rename to lldb/test/API/types/TestLongTypesExpr.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py b/lldb/test/API/types/TestRecursiveTypes.py rename from lldb/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py rename to lldb/test/API/types/TestRecursiveTypes.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestShortType.py b/lldb/test/API/types/TestShortType.py rename from lldb/packages/Python/lldbsuite/test/types/TestShortType.py rename to lldb/test/API/types/TestShortType.py diff --git a/lldb/packages/Python/lldbsuite/test/types/TestShortTypeExpr.py b/lldb/test/API/types/TestShortTypeExpr.py rename from lldb/packages/Python/lldbsuite/test/types/TestShortTypeExpr.py rename to lldb/test/API/types/TestShortTypeExpr.py diff --git a/lldb/packages/Python/lldbsuite/test/types/basic_type.cpp b/lldb/test/API/types/basic_type.cpp rename from lldb/packages/Python/lldbsuite/test/types/basic_type.cpp rename to lldb/test/API/types/basic_type.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/char.cpp b/lldb/test/API/types/char.cpp rename from lldb/packages/Python/lldbsuite/test/types/char.cpp rename to lldb/test/API/types/char.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/double.cpp b/lldb/test/API/types/double.cpp rename from lldb/packages/Python/lldbsuite/test/types/double.cpp rename to lldb/test/API/types/double.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/float.cpp b/lldb/test/API/types/float.cpp rename from lldb/packages/Python/lldbsuite/test/types/float.cpp rename to lldb/test/API/types/float.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/int.cpp b/lldb/test/API/types/int.cpp rename from lldb/packages/Python/lldbsuite/test/types/int.cpp rename to lldb/test/API/types/int.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/long.cpp b/lldb/test/API/types/long.cpp rename from lldb/packages/Python/lldbsuite/test/types/long.cpp rename to lldb/test/API/types/long.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/long_long.cpp b/lldb/test/API/types/long_long.cpp rename from lldb/packages/Python/lldbsuite/test/types/long_long.cpp rename to lldb/test/API/types/long_long.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/recursive_type_1.cpp b/lldb/test/API/types/recursive_type_1.cpp rename from lldb/packages/Python/lldbsuite/test/types/recursive_type_1.cpp rename to lldb/test/API/types/recursive_type_1.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/recursive_type_2.cpp b/lldb/test/API/types/recursive_type_2.cpp rename from lldb/packages/Python/lldbsuite/test/types/recursive_type_2.cpp rename to lldb/test/API/types/recursive_type_2.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/recursive_type_main.cpp b/lldb/test/API/types/recursive_type_main.cpp rename from lldb/packages/Python/lldbsuite/test/types/recursive_type_main.cpp rename to lldb/test/API/types/recursive_type_main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/short.cpp b/lldb/test/API/types/short.cpp rename from lldb/packages/Python/lldbsuite/test/types/short.cpp rename to lldb/test/API/types/short.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/unsigned_char.cpp b/lldb/test/API/types/unsigned_char.cpp rename from lldb/packages/Python/lldbsuite/test/types/unsigned_char.cpp rename to lldb/test/API/types/unsigned_char.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/unsigned_int.cpp b/lldb/test/API/types/unsigned_int.cpp rename from lldb/packages/Python/lldbsuite/test/types/unsigned_int.cpp rename to lldb/test/API/types/unsigned_int.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/unsigned_long.cpp b/lldb/test/API/types/unsigned_long.cpp rename from lldb/packages/Python/lldbsuite/test/types/unsigned_long.cpp rename to lldb/test/API/types/unsigned_long.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/unsigned_long_long.cpp b/lldb/test/API/types/unsigned_long_long.cpp rename from lldb/packages/Python/lldbsuite/test/types/unsigned_long_long.cpp rename to lldb/test/API/types/unsigned_long_long.cpp diff --git a/lldb/packages/Python/lldbsuite/test/types/unsigned_short.cpp b/lldb/test/API/types/unsigned_short.cpp rename from lldb/packages/Python/lldbsuite/test/types/unsigned_short.cpp rename to lldb/test/API/types/unsigned_short.cpp