llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Ebuka Ezike (da-viper) <details> <summary>Changes</summary> Expose commonly used classes in the lldb_dap package and avoid repeating the lldb_dap namespace. --- Patch is 34.88 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/209442.diff 47 Files Affected: - (modified) lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py (+12-4) - (modified) lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py (+1-1) - (modified) lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py (+1-1) - (renamed) lldb/packages/Python/lldbsuite/test/tools/lldb_dap/testcase.py (+1-1) - (renamed) lldb/packages/Python/lldbsuite/test/tools/lldb_dap/types.py () - (modified) lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py (+1-1) - (modified) lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py (+3-3) - (modified) lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py (+3-3) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py (+2-6) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_termination.py (+1-1) - (modified) lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_version.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/module/TestDAP_module.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_DAPConnection.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py (+2-2) - (modified) lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py (+1-1) - (modified) lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py (+2-3) - (modified) lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py (+3-4) ``````````diff diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py index 5e378bfd8b97f..d5f2732a56073 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py @@ -1,5 +1,13 @@ -from .lldb_dap_testcase import DAPTestCaseBase -from .session_helpers import DAPTestSession -from .utils import DebugAdapter, DebugAdapterOptions +from .testcase import DAPTestCaseBase +from .session_helpers import DAPTestSession, ExpectEval, ExpectVar +from .utils import DAPConnection, DebugAdapter, DebugAdapterOptions -__all__ = ["DAPTestCaseBase", "DAPTestSession", "DebugAdapter", "DebugAdapterOptions"] +__all__ = [ + "DAPConnection", + "DAPTestCaseBase", + "DAPTestSession", + "DebugAdapter", + "DebugAdapterOptions", + "ExpectEval", + "ExpectVar", +] diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py index 156c3e2a41d0d..70c1d2ef43b1d 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py @@ -15,7 +15,7 @@ from pathlib import Path from typing import Any, Callable, Generic, Optional, Type, TypeVar -from .dap_types import ( +from .types import ( AnyResponse, ArgsProtocol, Capabilities, diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py index 35a2d6c2f281a..29f6d52571c67 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py @@ -19,7 +19,7 @@ cast, ) -from .dap_types import ( +from .types import ( AttachArgs, Breakpoint, BreakpointEvent, diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/lldb_dap_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/testcase.py similarity index 99% rename from lldb/packages/Python/lldbsuite/test/tools/lldb_dap/lldb_dap_testcase.py rename to lldb/packages/Python/lldbsuite/test/tools/lldb_dap/testcase.py index ac74770e2e4bc..18085e5156aef 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/lldb_dap_testcase.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/testcase.py @@ -5,7 +5,7 @@ from lldbsuite.test.lldbtest import Base, LLDBTestCaseFactory, is_exe -from .dap_types import AnyResponse, ErrorResponse, Response +from .types import AnyResponse, ErrorResponse, Response from .session_helpers import DAPTestSession from .utils import DebugAdapter, DebugAdapterOptions diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/dap_types.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/types.py similarity index 100% rename from lldb/packages/Python/lldbsuite/test/tools/lldb_dap/dap_types.py rename to lldb/packages/Python/lldbsuite/test/tools/lldb_dap/types.py diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py index 61147e3e31e52..3251475173866 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py @@ -16,7 +16,7 @@ from pprint import pformat from typing import IO, Callable, Optional, Protocol, Tuple, Type, runtime_checkable -from .dap_types import ( +from .types import ( AnyEvent, DAPError, Event, diff --git a/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py b/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py index c1657853e8c94..23e8763cf8d81 100644 --- a/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py +++ b/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py @@ -2,13 +2,13 @@ Test exception behavior in DAP with signal. """ +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.decorators import skipIfNoSignals -from lldbsuite.test.tools.lldb_dap import lldb_dap_testcase -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs @skipIfNoSignals -class TestDAP_exception(lldb_dap_testcase.DAPTestCaseBase): +class TestDAP_exception(DAPTestCaseBase): def test_stopped_description(self): """ Test that exception description is shown correctly in stopped diff --git a/lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py b/lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py index 7f6afd078219a..ea7b750d90c82 100644 --- a/lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py +++ b/lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py @@ -3,8 +3,8 @@ """ from lldbsuite.test.decorators import skipUnlessAddressSanitizer -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_asan(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py b/lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py index 49a3907b94bf0..4cd2f8bf1e0f7 100644 --- a/lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py +++ b/lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py @@ -4,8 +4,8 @@ from lldbsuite.test.decorators import skipIfWasm, skipIfWindows from lldbsuite.test.lldbtest import line_number -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase @skipIfWasm # wasm inferiors are built with -fno-exceptions. diff --git a/lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py b/lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py index cbabbb19dfea0..5d56744dc77fe 100644 --- a/lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py +++ b/lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py @@ -3,8 +3,8 @@ """ from lldbsuite.test.decorators import skipUnlessDarwin -from lldbsuite.test.tools.lldb_dap.dap_types import ExceptionFilterOptions, LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import ExceptionFilterOptions, LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_exception_objc(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py b/lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py index fd2d46c730972..1981823dbc1bd 100644 --- a/lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py +++ b/lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py @@ -3,8 +3,8 @@ """ from lldbsuite.test.decorators import skipUnlessUndefinedBehaviorSanitizer -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_ubsan(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py index 98091e63d58cf..2acc7e9f2f8f2 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py @@ -2,8 +2,8 @@ Test lldb-dap launch request. """ -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_args(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py index 8cbad660651b6..48a27822ea265 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py @@ -2,11 +2,11 @@ Test lldb-dap launch request. """ -from lldbsuite.test.tools.lldb_dap import lldb_dap_testcase -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs -class TestDAP_launch_basic(lldb_dap_testcase.DAPTestCaseBase): +class TestDAP_launch_basic(DAPTestCaseBase): """ Tests the default launch of a simple program. No arguments, environment, or anything else is specified. diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py index 21a3f61460de5..f620b90afe5aa 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py @@ -4,8 +4,8 @@ from lldbsuite.test.decorators import skipIf from lldbsuite.test.lldbtest import line_number -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_commands(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py index a7e4ffab3d640..21fac2b785b88 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py @@ -4,8 +4,8 @@ import os -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_cwd(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py index 6bf470ed142e3..8de9a89517733 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py @@ -5,8 +5,8 @@ import os from lldbsuite.test import lldbplatformutil -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_debuggerRoot(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py index 39d350f3e9d57..25ee2c363c981 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py @@ -3,8 +3,8 @@ """ from lldbsuite.test.decorators import skipIfWindows -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_disableSTDIO(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py index 2e96a1139c937..c87bad80d8c6c 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py @@ -3,8 +3,8 @@ """ from lldbsuite.test.decorators import skipIfWindows -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_environment_with_array(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py index a853bbc341791..b24c800bac0ee 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py @@ -3,8 +3,8 @@ """ from lldbsuite.test.decorators import skipIfWindows -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_environment_with_object(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py index 92c481ad9d42d..946c57db1f948 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py @@ -4,8 +4,8 @@ from lldbsuite.test.decorators import skipIf from lldbsuite.test.lldbtest import line_number -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_extra_launch_commands(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py index c4dc50ad463e6..b0208bc0afce4 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py @@ -2,8 +2,8 @@ Test lldb-dap launch request. """ -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_failing_console(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py index 13730ed311206..d15572d6afaa6 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py @@ -5,8 +5,8 @@ import os import re -from lldbsuite.test.tools.lldb_dap.dap_types import InitializedEvent, LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import InitializedEvent, LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_failing_launch_commands(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py index dfd28e6b7f783..23ba827039a27 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py @@ -2,8 +2,8 @@ Test lldb-dap launch request. """ -from lldbsuite.test.tools.lldb_dap.dap_types import Console, LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import Console, LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_invalid_launch_commands_and_console(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py index 60746599a2638..08461bc8dd6b7 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py @@ -2,8 +2,8 @@ Test lldb-dap launch request. """ -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_invalid_program(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py index 22cfcf3078b11..1704129344295 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py @@ -5,8 +5,8 @@ import os import tempfile -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.utils import DebugAdapterOptions diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py index 38157849facfb..726ec61779688 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py @@ -4,8 +4,8 @@ import os -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_shellExpandArguments_disabled(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py index e5ba6a4852714..b716c3fd24c00 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py @@ -5,8 +5,8 @@ import os from lldbsuite.test.decorators import expectedFailureAll, skipIfLinux -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_shellExpandArguments_enabled(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py index b62276c25f285..5deee899255d0 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py @@ -4,8 +4,8 @@ import os -from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs -from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase class TestDAP_launch_sourcePath(DAPTestCaseBase): diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection.py b/lldb/test/API/tools/lldb-dap... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/209442 _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
