[Lldb-commits] [lldb] [lldb-dap][NFC] Use wildcard imports for test decorators, utils and types. (PR #216235)
Ebuka Ezike via lldb-commits
lldb-commits at lists.llvm.org
Thu Aug 13 19:59:36 PDT 2026
https://github.com/da-viper created https://github.com/llvm/llvm-project/pull/216235
Replace explicit imports `from ... import (a, b, c)` with wildcard imports `from ... import *` for `lldbsuite.test.decorators` and `lldbsuite.test.lldbutil`.
This lets downstream forks introduce extra decorators (e.g. to skip tests on private configurations) or additional util helpers without needing to patch each test's import list.
>From 22badc33142f2047f13dbb15a1d8aecacabf9c1f Mon Sep 17 00:00:00 2001
From: Ebuka Ezike <yerimyah1 at gmail.com>
Date: Thu, 13 Aug 2026 16:22:27 +0100
Subject: [PATCH] [lldb-dap][NFC] Use wildcard imports for test decorators,
utils and DAP types
Replace explicit imports `from ... import (a, b, c)` with
wildcard imports `from ... import *` for `lldbsuite.test.decorators` and
`lldbsuite.test.lldbutil`.
This lets downstream forks introduce extra decorators (e.g. to skip
tests on private configurations) or additional util helpers
without needing to patch each test's import list.
---
.../attach-commands/TestDAP_attachCommands.py | 4 ++--
.../API/tools/lldb-dap/attach/TestDAP_attach.py | 14 ++------------
.../lldb-dap/attach/TestDAP_attachByPortNum.py | 6 +++---
.../TestDAP_breakpointAssembly.py | 2 +-
.../TestDAP_breakpointEvents.py | 15 +++------------
.../breakpoint/TestDAP_breakpointLocations.py | 9 +++------
.../lldb-dap/breakpoint/TestDAP_logpoints.py | 14 +++-----------
.../breakpoint/TestDAP_setBreakpoints.py | 16 +++-------------
.../TestDAP_setExceptionBreakpoints.py | 5 +----
.../TestDAP_setFunctionBreakpoints.py | 11 ++---------
.../API/tools/lldb-dap/cancel/TestDAP_cancel.py | 5 ++---
.../tools/lldb-dap/commands/TestDAP_commands.py | 2 +-
.../lldb-dap/completions/TestDAP_completions.py | 11 +++--------
.../tools/lldb-dap/console/TestDAP_console.py | 4 ++--
.../console/TestDAP_redirection_to_console.py | 4 ++--
.../TestDAP_setDataBreakpoints.py | 6 +++---
.../lldb-dap/disassemble/TestDAP_disassemble.py | 4 ++--
.../tools/lldb-dap/evaluate/TestDAP_evaluate.py | 8 ++++----
.../eventStatistic/TestDAP_eventStatistic.py | 6 +-----
.../lldb-dap/exception/TestDAP_exception.py | 2 +-
.../lldb-dap/exception/asan/TestDAP_asan.py | 2 +-
.../exception/cpp/TestDAP_exception_cpp.py | 4 ++--
.../exception/objc/TestDAP_exception_objc.py | 4 ++--
.../lldb-dap/exception/ubsan/TestDAP_ubsan.py | 2 +-
.../TestDAP_extendedStackTrace.py | 8 ++++----
.../TestDAP_instruction_breakpoint.py | 4 ++--
.../TestDAP_invalidatedEvent.py | 4 ++--
.../lldb-dap/launch/TestDAP_launch_commands.py | 4 ++--
.../tools/lldb-dap/launch/TestDAP_launch_cwd.py | 2 +-
.../launch/TestDAP_launch_disableSTDIO.py | 2 +-
.../TestDAP_launch_environment_with_array.py | 2 +-
.../TestDAP_launch_environment_with_object.py | 2 +-
.../TestDAP_launch_extra_launch_commands.py | 4 ++--
...stDAP_launch_shellExpandArguments_enabled.py | 2 +-
...tDAP_launch_stdio_redirection_and_console.py | 9 +--------
.../launch/TestDAP_launch_stopOnEntry.py | 2 +-
.../launch/TestDAP_launch_terminate_commands.py | 2 +-
.../launch/TestDAP_launch_win_debug_heap.py | 2 +-
.../io/TestDAP_launch_io_integratedTerminal.py | 10 ++--------
.../io/TestDAP_launch_io_internalConsole.py | 4 ++--
.../lldb-dap/locations/TestDAP_locations.py | 4 ++--
.../longpath/TestDAP_launch_longPath.py | 4 ++--
.../module-event/TestDAP_module_event.py | 9 +++------
.../API/tools/lldb-dap/module/TestDAP_module.py | 17 +++--------------
.../moduleSymbols/TestDAP_moduleSymbols.py | 4 ++--
.../lldb-dap/optimized/TestDAP_optimized.py | 4 ++--
.../API/tools/lldb-dap/output/TestDAP_output.py | 4 ++--
.../repl-mode/TestDAP_repl_mode_detection.py | 2 +-
.../tools/lldb-dap/restart/TestDAP_restart.py | 4 ++--
.../lldb-dap/restart/TestDAP_restart_console.py | 10 ++--------
.../lldb-dap/send-event/TestDAP_sendEvent.py | 6 +++---
.../API/tools/lldb-dap/source/TestDAP_source.py | 6 +++---
.../stackTrace-x86/TestDAP_source_x86.py | 4 ++--
.../lldb-dap/stackTrace/TestDAP_stackTrace.py | 10 +++-------
.../subtleFrames/TestDAP_subtleFrames.py | 4 ++--
.../TestDAP_stackTraceCompilerGeneratedCode.py | 2 +-
.../TestDAP_stackTraceDisassemblyDisplay.py | 2 +-
.../TestDAP_stackTraceMissingFunctionName.py | 2 +-
.../TestDAP_stackTraceMissingModule.py | 4 ++--
.../API/tools/lldb-dap/step/TestDAP_step.py | 4 ++--
.../stepInTargets/TestDAP_stepInTargets.py | 4 ++--
.../stopped-events/TestDAP_stopped_events.py | 10 ++--------
.../terminated-event/TestDAP_terminatedEvent.py | 7 ++-----
.../tools/lldb-dap/threads/TestDAP_threads.py | 4 ++--
.../lldb-dap/utils/TestDAPUtils_EventHistory.py | 17 +++--------------
.../tools/lldb-dap/utils/TestDAPUtils_Types.py | 15 +--------------
.../lldb-dap/variables/TestDAP_variables.py | 15 +++------------
.../children/TestDAP_variables_children.py | 4 ++--
68 files changed, 133 insertions(+), 272 deletions(-)
diff --git a/lldb/test/API/tools/lldb-dap/attach-commands/TestDAP_attachCommands.py b/lldb/test/API/tools/lldb-dap/attach-commands/TestDAP_attachCommands.py
index 97ee08c6fab14..1b5a91e6d7f3c 100644
--- a/lldb/test/API/tools/lldb-dap/attach-commands/TestDAP_attachCommands.py
+++ b/lldb/test/API/tools/lldb-dap/attach-commands/TestDAP_attachCommands.py
@@ -2,9 +2,9 @@
Test lldb-dap attach commands
"""
-from lldbsuite.test.decorators import skipIfNetBSD, skipIfWasm
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import AttachArgs, PauseArgs
+from lldbsuite.test.tools.lldb_dap.types import *
class TestDAP_attachCommands(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py
index 9baec029c45a4..5e70d077bf78a 100644
--- a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py
+++ b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py
@@ -7,19 +7,9 @@
from pathlib import Path
from lldbsuite.test import lldbutil
-from lldbsuite.test.decorators import (
- expectedFailureWindows,
- expectedFailureWindowsAndNoLLDBServer,
- requireNotWasm,
- skipIf,
- skipIfWindowsAndLLDBServer,
-)
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import (
- AttachArgs,
- ProcessEvent,
- ProgressStartEvent,
-)
+from lldbsuite.test.tools.lldb_dap.types import *
# Often fails on Arm Linux, but not specifically because it's Arm, something in
diff --git a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py
index 22129996ddd3e..99638a9847cbb 100644
--- a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py
+++ b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py
@@ -6,10 +6,10 @@
from lldbgdbserverutils import Pipe
from lldbsuite.test import lldbplatformutil
-from lldbsuite.test.decorators import skipIfNetBSD, skipIfWasm, skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import AttachArgs
+from lldbsuite.test.tools.lldb_dap.types import *
import lldb
diff --git a/lldb/test/API/tools/lldb-dap/breakpoint-assembly/TestDAP_breakpointAssembly.py b/lldb/test/API/tools/lldb-dap/breakpoint-assembly/TestDAP_breakpointAssembly.py
index 9bc3d989ca4f6..992bd32522b0d 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint-assembly/TestDAP_breakpointAssembly.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint-assembly/TestDAP_breakpointAssembly.py
@@ -2,7 +2,7 @@
Test lldb-dap setBreakpoints request in assembly source references.
"""
-from lldbsuite.test.decorators import skipIfWindows
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py b/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py
index e0057d4dba1b8..29b8987fb9ead 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py
@@ -5,19 +5,10 @@
import os
from typing import List
-from lldbsuite.test.decorators import (
- skipIfTargetDoesNotSupportSharedLibraries,
- skipIfWindows,
-)
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import (
- Breakpoint,
- BreakpointEvent,
- BreakpointReason,
- Event,
- LaunchArgs,
-)
+from lldbsuite.test.tools.lldb_dap.types import *
@skipIfTargetDoesNotSupportSharedLibraries()
diff --git a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py
index a9c5a801c1f92..98091cdb0644c 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py
@@ -4,13 +4,10 @@
import os
-from lldbsuite.test.decorators import (
- skipIfTargetDoesNotSupportSharedLibraries,
- skipIfWindows,
-)
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import BreakpointLocation, LaunchArgs
+from lldbsuite.test.tools.lldb_dap.types import *
@skipIfTargetDoesNotSupportSharedLibraries()
diff --git a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_logpoints.py b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_logpoints.py
index 2135f179cc622..4c41f5abd81e0 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_logpoints.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_logpoints.py
@@ -4,18 +4,10 @@
import os
-from lldbsuite.test.decorators import (
- skipIfTargetDoesNotSupportSharedLibraries,
- skipIfWindows,
-)
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession
-from lldbsuite.test.tools.lldb_dap.types import (
- LaunchArgs,
- SourceBreakpoint,
- StoppedEvent,
-)
-
+from lldbsuite.test.tools.lldb_dap.types import *
@skipIfTargetDoesNotSupportSharedLibraries()
class TestDAP_logpoints(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py
index 94c69436bd9b5..004b1828d6825 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py
@@ -6,20 +6,10 @@
import shutil
from typing import Dict
-from lldbsuite.test.decorators import (
- skipIfTargetDoesNotSupportSharedLibraries,
- skipIfWasm,
- skipIfWindows,
-)
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import (
- DAPTestGetTargetBreakpointsArgs,
- LaunchArgs,
- SetBreakpointsArgs,
- Source,
- SourceBreakpoint,
-)
+from lldbsuite.test.tools.lldb_dap.types import *
@skipIfWasm # inferior built without exception support
diff --git a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setExceptionBreakpoints.py b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setExceptionBreakpoints.py
index 0b1b8a6b5a541..0f11e828756c7 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setExceptionBreakpoints.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setExceptionBreakpoints.py
@@ -2,10 +2,7 @@
Test lldb-dap setExceptionBreakpoints request
"""
-from lldbsuite.test.decorators import (
- skipIfTargetDoesNotSupportSharedLibraries,
- skipIfWindows,
-)
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
diff --git a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py
index 1572cab8d852e..52247eae9c94f 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py
@@ -2,16 +2,9 @@
Test lldb-dap setFunctionBreakpoints request
"""
-from lldbsuite.test.decorators import (
- skipIfTargetDoesNotSupportSharedLibraries,
- skipIfWindows,
-)
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import (
- DAPTestGetTargetBreakpointsArgs,
- FunctionBreakpoint,
- LaunchArgs,
-)
+from lldbsuite.test.tools.lldb_dap.types import *
@skipIfTargetDoesNotSupportSharedLibraries()
diff --git a/lldb/test/API/tools/lldb-dap/cancel/TestDAP_cancel.py b/lldb/test/API/tools/lldb-dap/cancel/TestDAP_cancel.py
index f639d01f851b2..5bccb04516a5c 100644
--- a/lldb/test/API/tools/lldb-dap/cancel/TestDAP_cancel.py
+++ b/lldb/test/API/tools/lldb-dap/cancel/TestDAP_cancel.py
@@ -4,9 +4,8 @@
import time
-from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.session_helpers import DAPTestSession
-from lldbsuite.test.tools.lldb_dap.types import CancelArgs, EvaluateArgs, LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession
+from lldbsuite.test.tools.lldb_dap.types import *
class TestDAP_cancel(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/commands/TestDAP_commands.py b/lldb/test/API/tools/lldb-dap/commands/TestDAP_commands.py
index e79c2895fa963..e0d0f83e6803f 100644
--- a/lldb/test/API/tools/lldb-dap/commands/TestDAP_commands.py
+++ b/lldb/test/API/tools/lldb-dap/commands/TestDAP_commands.py
@@ -2,7 +2,7 @@
Test lldb-dap command hooks
"""
-from lldbsuite.test.tools.lldb_dap.types import AttachArgs, LaunchArgs
+from lldbsuite.test.tools.lldb_dap.types import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/completions/TestDAP_completions.py b/lldb/test/API/tools/lldb-dap/completions/TestDAP_completions.py
index 73023e8e3cd01..6d30ec3df18bb 100644
--- a/lldb/test/API/tools/lldb-dap/completions/TestDAP_completions.py
+++ b/lldb/test/API/tools/lldb-dap/completions/TestDAP_completions.py
@@ -7,15 +7,10 @@
from typing import Optional, Union
-from lldbsuite.test.decorators import skipIf
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession
-from lldbsuite.test.tools.lldb_dap.types import (
- CompletionItem,
- LaunchArgs,
- StoppedReason,
-)
-
+from lldbsuite.test.tools.lldb_dap.types import *
session_completion = CompletionItem(
label="session",
diff --git a/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py b/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
index 89db508bf7c38..ade5706f0aac4 100644
--- a/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
+++ b/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
@@ -6,8 +6,8 @@
import os
import unittest
-from lldbsuite.test.decorators import requireNotWindows, requireNotWasm
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession
from lldbsuite.test.skip_reason import UnsupportedReason
diff --git a/lldb/test/API/tools/lldb-dap/console/TestDAP_redirection_to_console.py b/lldb/test/API/tools/lldb-dap/console/TestDAP_redirection_to_console.py
index a904f77770e9a..101163d5d330f 100644
--- a/lldb/test/API/tools/lldb-dap/console/TestDAP_redirection_to_console.py
+++ b/lldb/test/API/tools/lldb-dap/console/TestDAP_redirection_to_console.py
@@ -1,10 +1,10 @@
"""Test that lldb-dap keeps stdout/stderr redirection working even when the
inferior's output is routed back through the debug console."""
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.utils import DebugAdapterOptions
+from lldbsuite.test.tools.lldb_dap.utils import *
class TestDAP_redirection_to_console(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/databreakpoint/TestDAP_setDataBreakpoints.py b/lldb/test/API/tools/lldb-dap/databreakpoint/TestDAP_setDataBreakpoints.py
index bd228e80746a1..9913d6ba86b16 100644
--- a/lldb/test/API/tools/lldb-dap/databreakpoint/TestDAP_setDataBreakpoints.py
+++ b/lldb/test/API/tools/lldb-dap/databreakpoint/TestDAP_setDataBreakpoints.py
@@ -2,10 +2,10 @@
Test lldb-dap dataBreakpointInfo and setDataBreakpoints requests
"""
-from lldbsuite.test.decorators import requireNotWasm, skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import DataBreakpoint, LaunchArgs
+from lldbsuite.test.tools.lldb_dap.types import *
@requireNotWasm("data breakpoints map to watchpoints")
diff --git a/lldb/test/API/tools/lldb-dap/disassemble/TestDAP_disassemble.py b/lldb/test/API/tools/lldb-dap/disassemble/TestDAP_disassemble.py
index 8bf1ff19cc510..d0840f382aebf 100644
--- a/lldb/test/API/tools/lldb-dap/disassemble/TestDAP_disassemble.py
+++ b/lldb/test/API/tools/lldb-dap/disassemble/TestDAP_disassemble.py
@@ -2,8 +2,8 @@
Test lldb-dap disassemble request
"""
-from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py b/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
index b139593c0cb9e..8d506d5319797 100644
--- a/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
+++ b/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
@@ -5,11 +5,11 @@
import re
from typing import Optional, Union
-from lldbsuite.test.decorators import skipIfWasm, skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.session_helpers import ExpectEval, FrameContext
-from lldbsuite.test.tools.lldb_dap.types import EvaluateContext, LaunchArgs, ValueFormat
+from lldbsuite.test.tools.lldb_dap.session_helpers import *
+from lldbsuite.test.tools.lldb_dap.types import *
@skipIfWasm # no expression evaluation
diff --git a/lldb/test/API/tools/lldb-dap/eventStatistic/TestDAP_eventStatistic.py b/lldb/test/API/tools/lldb-dap/eventStatistic/TestDAP_eventStatistic.py
index ed7e67b347679..1cfd5f453ed39 100644
--- a/lldb/test/API/tools/lldb-dap/eventStatistic/TestDAP_eventStatistic.py
+++ b/lldb/test/API/tools/lldb-dap/eventStatistic/TestDAP_eventStatistic.py
@@ -4,11 +4,7 @@
import json
-from lldbsuite.test.decorators import (
- skipIfRemote,
- skipIfTargetDoesNotSupportSharedLibraries,
- skipIfWindows,
-)
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import InitializedEvent, LaunchArgs
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 9170118e2f309..072308c0b9538 100644
--- a/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py
+++ b/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py
@@ -3,7 +3,7 @@
"""
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.decorators import requireSignals
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
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 ea7b750d90c82..e857884a93414 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
@@ -2,7 +2,7 @@
Test that we stop at runtime instrumentation locations (asan).
"""
-from lldbsuite.test.decorators import skipUnlessAddressSanitizer
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import 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 4cd2f8bf1e0f7..07c552140e5f0 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
@@ -2,8 +2,8 @@
Test exception behavior in DAP with c++ throw.
"""
-from lldbsuite.test.decorators import skipIfWasm, skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
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 5fd50882b0978..ddf710c17a700 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
@@ -2,8 +2,8 @@
Test exception behavior in DAP with obj-c throw.
"""
-from lldbsuite.test.decorators import requireDarwin
-from lldbsuite.test.tools.lldb_dap.types import ExceptionFilterOptions, LaunchArgs
+from lldbsuite.test.decorators import *
+from lldbsuite.test.tools.lldb_dap.types import *
from lldbsuite.test.tools.lldb_dap import 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 1981823dbc1bd..8637b2016bc5c 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
@@ -2,7 +2,7 @@
Test that we stop at runtime instrumentation locations (ubsan).
"""
-from lldbsuite.test.decorators import skipUnlessUndefinedBehaviorSanitizer
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/extendedStackTrace/TestDAP_extendedStackTrace.py b/lldb/test/API/tools/lldb-dap/extendedStackTrace/TestDAP_extendedStackTrace.py
index ac7249aff00c7..493141a9dcfa9 100644
--- a/lldb/test/API/tools/lldb-dap/extendedStackTrace/TestDAP_extendedStackTrace.py
+++ b/lldb/test/API/tools/lldb-dap/extendedStackTrace/TestDAP_extendedStackTrace.py
@@ -4,11 +4,11 @@
import os
-from lldbsuite.test.decorators import requireDarwin
-from lldbsuite.test.lldbplatformutil import findBacktraceRecordingDylib
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbplatformutil import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StackFrameFormat
+from lldbsuite.test.tools.lldb_dap.types import *
class TestDAP_extendedStackTrace(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/instruction-breakpoint/TestDAP_instruction_breakpoint.py b/lldb/test/API/tools/lldb-dap/instruction-breakpoint/TestDAP_instruction_breakpoint.py
index 9438871bd6764..dfd2efb054881 100644
--- a/lldb/test/API/tools/lldb-dap/instruction-breakpoint/TestDAP_instruction_breakpoint.py
+++ b/lldb/test/API/tools/lldb-dap/instruction-breakpoint/TestDAP_instruction_breakpoint.py
@@ -4,8 +4,8 @@
import os
-from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
diff --git a/lldb/test/API/tools/lldb-dap/invalidated-event/TestDAP_invalidatedEvent.py b/lldb/test/API/tools/lldb-dap/invalidated-event/TestDAP_invalidatedEvent.py
index 301873116caaf..03e13fa6e8ca5 100644
--- a/lldb/test/API/tools/lldb-dap/invalidated-event/TestDAP_invalidatedEvent.py
+++ b/lldb/test/API/tools/lldb-dap/invalidated-event/TestDAP_invalidatedEvent.py
@@ -4,8 +4,8 @@
know about it.
"""
-from lldbsuite.test.decorators import skipIfWasm
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
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 f620b90afe5aa..af0485f615dfb 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
@@ -2,8 +2,8 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.decorators import skipIf
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import 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 5dba839ae040a..21e66a055d8f5 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,7 +4,7 @@
import os
-from lldbsuite.test.decorators import skipIfWasm
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import 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 25ee2c363c981..61a85e284edc7 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
@@ -2,7 +2,7 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.decorators import skipIfWindows
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import 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 c87bad80d8c6c..6f286cf223e97 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
@@ -2,7 +2,7 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.decorators import skipIfWindows
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import 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 b24c800bac0ee..4a2acf6232cf5 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
@@ -2,7 +2,7 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.decorators import skipIfWindows
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import 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 946c57db1f948..a1ff3ce92444a 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
@@ -2,8 +2,8 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.decorators import skipIf
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import 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 0c5fc58b7ba79..532d903725cb6 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
@@ -4,7 +4,7 @@
import os
-from lldbsuite.test.decorators import expectedFailureAll, skipIfLinux, skipIfWasm
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py
index 477bd74aee514..9b9124d7e030e 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py
@@ -4,14 +4,7 @@
import tempfile
-from lldbsuite.test.decorators import (
- no_match,
- skipIf,
- skipIfAsan,
- skipIfBuildType,
- skipIfWasm,
- skipIfWindows,
-)
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import Console, LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py
index 66d3ad67c647a..b96849552af8b 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py
@@ -2,7 +2,7 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.tools.lldb_dap.types import ExitedEvent, LaunchArgs, StoppedEvent
+from lldbsuite.test.tools.lldb_dap.types import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py
index 98dd226dbc878..6ad05f82af0d6 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py
@@ -2,7 +2,7 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.decorators import skipIf, skipIfNetBSD
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_win_debug_heap.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_win_debug_heap.py
index e6298b66b57aa..7bbf0d0a70968 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_win_debug_heap.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_win_debug_heap.py
@@ -2,7 +2,7 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.decorators import requireWindows, skipIfBuildType
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, Console
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from typing import List
diff --git a/lldb/test/API/tools/lldb-dap/launch/io/TestDAP_launch_io_integratedTerminal.py b/lldb/test/API/tools/lldb-dap/launch/io/TestDAP_launch_io_integratedTerminal.py
index 9895b83d89d19..05f952eecd8c0 100644
--- a/lldb/test/API/tools/lldb-dap/launch/io/TestDAP_launch_io_integratedTerminal.py
+++ b/lldb/test/API/tools/lldb-dap/launch/io/TestDAP_launch_io_integratedTerminal.py
@@ -3,15 +3,9 @@
"""
from DAP_launch_io import DAP_launchIO
-from lldbsuite.test.decorators import (
- skipIfAsan,
- skipIfBuildType,
- skipIfRemote,
- skipIfWasm,
- skipIfWindows,
-)
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap import DAPTestSession
-from lldbsuite.test.tools.lldb_dap.types import Console, RunInTerminalRequest
+from lldbsuite.test.tools.lldb_dap.types import *
@skipIfRemote
diff --git a/lldb/test/API/tools/lldb-dap/launch/io/TestDAP_launch_io_internalConsole.py b/lldb/test/API/tools/lldb-dap/launch/io/TestDAP_launch_io_internalConsole.py
index 8585917d95787..bd3a6b2668210 100644
--- a/lldb/test/API/tools/lldb-dap/launch/io/TestDAP_launch_io_internalConsole.py
+++ b/lldb/test/API/tools/lldb-dap/launch/io/TestDAP_launch_io_internalConsole.py
@@ -3,9 +3,9 @@
"""
from DAP_launch_io import DAP_launchIO
-from lldbsuite.test.decorators import skipIfWindows
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap import DAPTestSession
-from lldbsuite.test.tools.lldb_dap.types import Console
+from lldbsuite.test.tools.lldb_dap.types import *
@skipIfWindows
diff --git a/lldb/test/API/tools/lldb-dap/locations/TestDAP_locations.py b/lldb/test/API/tools/lldb-dap/locations/TestDAP_locations.py
index 98948714bf08e..f209a7fc5dd05 100644
--- a/lldb/test/API/tools/lldb-dap/locations/TestDAP_locations.py
+++ b/lldb/test/API/tools/lldb-dap/locations/TestDAP_locations.py
@@ -2,8 +2,8 @@
Test lldb-dap locations request
"""
-from lldbsuite.test.decorators import skipIf, skipIfWasm, skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
diff --git a/lldb/test/API/tools/lldb-dap/longpath/TestDAP_launch_longPath.py b/lldb/test/API/tools/lldb-dap/longpath/TestDAP_launch_longPath.py
index 0e74d479be9df..a4b66abd8b887 100644
--- a/lldb/test/API/tools/lldb-dap/longpath/TestDAP_launch_longPath.py
+++ b/lldb/test/API/tools/lldb-dap/longpath/TestDAP_launch_longPath.py
@@ -7,9 +7,9 @@
import shutil
from lldbsuite.test import lldbutil
-from lldbsuite.test.decorators import requireWindows
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import ExitedEvent, LaunchArgs, TerminatedEvent
+from lldbsuite.test.tools.lldb_dap.types import *
MAX_PATH = 260
diff --git a/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py b/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py
index 78c610d10ca9f..4b1bc64f6ad8a 100644
--- a/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py
+++ b/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py
@@ -1,9 +1,6 @@
-from lldbsuite.test.decorators import (
- skipIfTargetDoesNotSupportSharedLibraries,
- skipIfWindows,
-)
-from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StoppedReason
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.tools.lldb_dap.types import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py b/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py
index 3f7c506a060fd..7e5af1801219e 100644
--- a/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py
+++ b/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py
@@ -5,20 +5,9 @@
import platform
import re
-from lldbsuite.test.decorators import (
- requireDarwin,
- skipIf,
- skipIfWindows,
- skipIfTargetDoesNotSupportSharedLibraries,
-)
-import lldbsuite.test.lldbplatformutil as lldbplatformutil
-from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.types import (
- CompileUnitsArgs,
- LaunchArgs,
- ModuleEvent,
- ModuleReason,
-)
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.tools.lldb_dap.types import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py b/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py
index 879a12dff92e7..0213548567dc6 100644
--- a/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py
+++ b/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py
@@ -2,8 +2,8 @@
Test lldb-dap moduleSymbols request
"""
-from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, ModuleSymbolsArgs
+from lldbsuite.test.decorators import *
+from lldbsuite.test.tools.lldb_dap.types import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py b/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
index efaeb9bbbc677..7210d85162566 100644
--- a/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
+++ b/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
@@ -2,8 +2,8 @@
Test lldb-dap variables/stackTrace request for optimized code
"""
-from lldbsuite.test.decorators import skipIfAsan, skipIfWasm, skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/output/TestDAP_output.py b/lldb/test/API/tools/lldb-dap/output/TestDAP_output.py
index 325d63cdc15e7..3e5f966ad3130 100644
--- a/lldb/test/API/tools/lldb-dap/output/TestDAP_output.py
+++ b/lldb/test/API/tools/lldb-dap/output/TestDAP_output.py
@@ -2,8 +2,8 @@
Test lldb-dap output events
"""
-from lldbsuite.test.decorators import skipIfWasm, skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/repl-mode/TestDAP_repl_mode_detection.py b/lldb/test/API/tools/lldb-dap/repl-mode/TestDAP_repl_mode_detection.py
index c27a5c5237b6e..1de07a4f60962 100644
--- a/lldb/test/API/tools/lldb-dap/repl-mode/TestDAP_repl_mode_detection.py
+++ b/lldb/test/API/tools/lldb-dap/repl-mode/TestDAP_repl_mode_detection.py
@@ -4,7 +4,7 @@
from typing import Optional
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart.py b/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart.py
index 031e5da52b016..85f13481015ec 100644
--- a/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart.py
+++ b/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart.py
@@ -2,8 +2,8 @@
Test lldb-dap RestartRequest.
"""
-from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
diff --git a/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py b/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py
index 524f0b1f13e73..626ad76a1d836 100644
--- a/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py
+++ b/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py
@@ -2,14 +2,8 @@
Test lldb-dap RestartRequest.
"""
-from lldbsuite.test.decorators import (
- skipIf,
- skipIfAsan,
- skipIfBuildType,
- skipIfWasm,
- skipIfWindows,
-)
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import Console, LaunchArgs
diff --git a/lldb/test/API/tools/lldb-dap/send-event/TestDAP_sendEvent.py b/lldb/test/API/tools/lldb-dap/send-event/TestDAP_sendEvent.py
index 481ba65d3aba8..c5f4c41ca3d16 100644
--- a/lldb/test/API/tools/lldb-dap/send-event/TestDAP_sendEvent.py
+++ b/lldb/test/API/tools/lldb-dap/send-event/TestDAP_sendEvent.py
@@ -6,10 +6,10 @@
from dataclasses import dataclass
from typing import List, Optional
-from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import Event, LaunchArgs, message_to_dict
+from lldbsuite.test.tools.lldb_dap.types import *
@dataclass(frozen=True)
diff --git a/lldb/test/API/tools/lldb-dap/source/TestDAP_source.py b/lldb/test/API/tools/lldb-dap/source/TestDAP_source.py
index c3180b5ece8a4..72a41958b96cb 100644
--- a/lldb/test/API/tools/lldb-dap/source/TestDAP_source.py
+++ b/lldb/test/API/tools/lldb-dap/source/TestDAP_source.py
@@ -2,10 +2,10 @@
Test lldb-dap source request
"""
-from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, Source, SourceArgs
+from lldbsuite.test.tools.lldb_dap.types import *
class TestDAP_source(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/stackTrace-x86/TestDAP_source_x86.py b/lldb/test/API/tools/lldb-dap/stackTrace-x86/TestDAP_source_x86.py
index f6c6e5c9e73d5..f846ff5edc0a9 100644
--- a/lldb/test/API/tools/lldb-dap/stackTrace-x86/TestDAP_source_x86.py
+++ b/lldb/test/API/tools/lldb-dap/stackTrace-x86/TestDAP_source_x86.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test import lldbplatformutil
-from lldbsuite.test.decorators import skipUnlessArch, skipUnlessPlatform
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
diff --git a/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py b/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py
index bd0906c73de6b..8ea63275cc0c3 100644
--- a/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py
+++ b/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py
@@ -5,13 +5,9 @@
import os
from typing import List, NamedTuple
-from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.types import (
- LaunchArgs,
- StackFrame,
- StackFrameFormat,
-)
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.tools.lldb_dap.types import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py b/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
index cf0ec80be8eb1..46baaf8bddd1f 100644
--- a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
+++ b/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
@@ -2,8 +2,8 @@
Test lldb-dap stack trace response
"""
-from lldbsuite.test.decorators import add_test_categories
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
diff --git a/lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py b/lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py
index b68a2be111fea..4b18e5f59738c 100644
--- a/lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py
+++ b/lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py
@@ -2,7 +2,7 @@
Test lldb-dap stackTrace request for compiler generated code
"""
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py b/lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py
index 9688608d696e7..da06acf7f763b 100644
--- a/lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py
+++ b/lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py
@@ -5,7 +5,7 @@
import os
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.session_helpers import ThreadContext
diff --git a/lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py b/lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py
index 7e0c883c63fc0..f232873c44393 100644
--- a/lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py
+++ b/lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py
@@ -2,7 +2,7 @@
Test lldb-dap stack trace response
"""
-from lldbsuite.test.decorators import skipIfWasm, skipIfWindows
+from lldbsuite.test.decorators import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py b/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py
index 88ebc53360477..7e0891d3ef52d 100644
--- a/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py
+++ b/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py
@@ -4,8 +4,8 @@
import re
-from lldbsuite.test.decorators import skipUnlessPlatform
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StoppedReason
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/step/TestDAP_step.py b/lldb/test/API/tools/lldb-dap/step/TestDAP_step.py
index e7f067a60768a..629b1e7f0942e 100644
--- a/lldb/test/API/tools/lldb-dap/step/TestDAP_step.py
+++ b/lldb/test/API/tools/lldb-dap/step/TestDAP_step.py
@@ -2,8 +2,8 @@
Test lldb-dap setBreakpoints request
"""
-from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
diff --git a/lldb/test/API/tools/lldb-dap/stepInTargets/TestDAP_stepInTargets.py b/lldb/test/API/tools/lldb-dap/stepInTargets/TestDAP_stepInTargets.py
index 2ed73500e94d3..b621cf1dc6dc5 100644
--- a/lldb/test/API/tools/lldb-dap/stepInTargets/TestDAP_stepInTargets.py
+++ b/lldb/test/API/tools/lldb-dap/stepInTargets/TestDAP_stepInTargets.py
@@ -2,8 +2,8 @@
Test lldb-dap stepInTargets request
"""
-from lldbsuite.test.decorators import expectedFailureAll, no_match, skipIf
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StepInTargetsArgs
diff --git a/lldb/test/API/tools/lldb-dap/stopped-events/TestDAP_stopped_events.py b/lldb/test/API/tools/lldb-dap/stopped-events/TestDAP_stopped_events.py
index 3957d32dc17c7..2b29efb71ba83 100644
--- a/lldb/test/API/tools/lldb-dap/stopped-events/TestDAP_stopped_events.py
+++ b/lldb/test/API/tools/lldb-dap/stopped-events/TestDAP_stopped_events.py
@@ -4,14 +4,8 @@
from typing import Sequence
-from lldbsuite.test.decorators import (
- expectedFailureAll,
- expectedFailureNetBSD,
- requireThreadSupport,
- skipIfLinux,
- skipIfWindows,
-)
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StoppedEvent, ThreadsArgs
diff --git a/lldb/test/API/tools/lldb-dap/terminated-event/TestDAP_terminatedEvent.py b/lldb/test/API/tools/lldb-dap/terminated-event/TestDAP_terminatedEvent.py
index 2b2ada858b747..c618c1e844988 100644
--- a/lldb/test/API/tools/lldb-dap/terminated-event/TestDAP_terminatedEvent.py
+++ b/lldb/test/API/tools/lldb-dap/terminated-event/TestDAP_terminatedEvent.py
@@ -4,11 +4,8 @@
import json
-from lldbsuite.test.decorators import (
- skipIfTargetDoesNotSupportSharedLibraries,
- skipIfWindows,
-)
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
diff --git a/lldb/test/API/tools/lldb-dap/threads/TestDAP_threads.py b/lldb/test/API/tools/lldb-dap/threads/TestDAP_threads.py
index 7f4052a19dfe9..9cdf11c4ae70b 100644
--- a/lldb/test/API/tools/lldb-dap/threads/TestDAP_threads.py
+++ b/lldb/test/API/tools/lldb-dap/threads/TestDAP_threads.py
@@ -2,8 +2,8 @@
Test lldb-dap threads request
"""
-from lldbsuite.test.decorators import requireThreadSupport
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StoppedReason, ThreadsArgs
diff --git a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py
index 8d4f51af17fe6..41a7331bf449c 100644
--- a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py
+++ b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py
@@ -1,20 +1,9 @@
import json
import threading
-from typing import List, Union
-
-from lldbsuite.test.tools.lldb_dap.types import (
- CapabilitiesEvent,
- DAPError,
- Event,
- ExitedEvent,
- InitializedEvent,
- ModuleEvent,
- OutputEvent,
- ProcessEvent,
- ProgressEndEvent,
- TerminatedEvent,
-)
+from typing import List
+
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import *
from lldbsuite.test.tools.lldb_dap.utils import EventHistory
diff --git a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py
index 08d080cb4e49d..d6c0381d28b15 100644
--- a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py
+++ b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py
@@ -3,20 +3,7 @@
from dataclasses import dataclass, field
from typing import Dict, List, Literal, Optional, Tuple, Type, TypeVar, Union, cast
-from lldbsuite.test.tools.lldb_dap.types import (
- EmptyBodyResponse,
- Event,
- EventName,
- OutputEvent,
- Request,
- SetBreakpointsArgs,
- Source,
- StackTraceResponse,
- StoppedEvent,
- StoppedReason,
- dict_to_message,
- message_to_dict,
-)
+from lldbsuite.test.tools.lldb_dap.types import *
T = TypeVar("T")
diff --git a/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py b/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
index 294b1d1560345..fbeb897c0376d 100644
--- a/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
+++ b/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
@@ -6,18 +6,9 @@
from typing import List, Optional
from lldbsuite.test import lldbplatformutil
-from lldbsuite.test.decorators import (
- no_debug_info_test,
- requireDarwin,
- skipIfAsan,
- skipIfWindows,
-)
-from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.types import (
- EvaluateContext,
- LaunchArgs,
- VariablesArgs,
-)
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.tools.lldb_dap.types import *
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, ExpectEval, ExpectVar
diff --git a/lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py b/lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py
index b0a0d41e9e64b..104f380cc243b 100644
--- a/lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py
+++ b/lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py
@@ -1,5 +1,5 @@
-from lldbsuite.test.decorators import expectedFailureAll, skipIfWasm
-from lldbsuite.test.lldbtest import line_number
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
More information about the lldb-commits
mailing list