https://github.com/da-viper updated https://github.com/llvm/llvm-project/pull/216235
>From b6c44954d882e49c6445886822320b361eb53585 Mon Sep 17 00:00:00 2001 From: Ebuka Ezike <[email protected]> Date: Thu, 13 Aug 2026 16:22:27 +0100 Subject: [PATCH] [lldb-dap][NFC] Use wild card imports for decorators Replace explicit imports `from ... import (a, b, c)` with wildcard imports `from ... import *` for `lldbsuite.test.decorators` This lets downstream forks introduce extra decorators (e.g. to skip tests on private configurations) without needing to patch each test's import list. [Related discourse](https://discourse.llvm.org/t/do-we-want-to-tighten-up-imports-in-the-api-testcases/91557/3) --- .../lldb-dap/attach-commands/TestDAP_attachCommands.py | 2 +- lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py | 8 +------- .../tools/lldb-dap/attach/TestDAP_attachByPortNum.py | 2 +- .../breakpoint-assembly/TestDAP_breakpointAssembly.py | 2 +- .../breakpoint-events/TestDAP_breakpointEvents.py | 5 +---- .../lldb-dap/breakpoint/TestDAP_breakpointLocations.py | 5 +---- .../API/tools/lldb-dap/breakpoint/TestDAP_logpoints.py | 6 +----- .../lldb-dap/breakpoint/TestDAP_setBreakpoints.py | 6 +----- .../breakpoint/TestDAP_setExceptionBreakpoints.py | 5 +---- .../breakpoint/TestDAP_setFunctionBreakpoints.py | 5 +---- .../tools/lldb-dap/completions/TestDAP_completions.py | 3 +-- .../test/API/tools/lldb-dap/console/TestDAP_console.py | 2 +- .../databreakpoint/TestDAP_setDataBreakpoints.py | 2 +- .../tools/lldb-dap/disassemble/TestDAP_disassemble.py | 2 +- .../API/tools/lldb-dap/evaluate/TestDAP_evaluate.py | 2 +- .../lldb-dap/eventStatistic/TestDAP_eventStatistic.py | 6 +----- .../API/tools/lldb-dap/exception/TestDAP_exception.py | 2 +- .../API/tools/lldb-dap/exception/asan/TestDAP_asan.py | 2 +- .../lldb-dap/exception/cpp/TestDAP_exception_cpp.py | 2 +- .../lldb-dap/exception/objc/TestDAP_exception_objc.py | 4 ++-- .../tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py | 2 +- .../extendedStackTrace/TestDAP_extendedStackTrace.py | 2 +- .../TestDAP_instruction_breakpoint.py | 2 +- .../invalidated-event/TestDAP_invalidatedEvent.py | 2 +- .../tools/lldb-dap/launch/TestDAP_launch_commands.py | 2 +- .../API/tools/lldb-dap/launch/TestDAP_launch_cwd.py | 2 +- .../lldb-dap/launch/TestDAP_launch_disableSTDIO.py | 2 +- .../launch/TestDAP_launch_environment_with_array.py | 2 +- .../launch/TestDAP_launch_environment_with_object.py | 2 +- .../launch/TestDAP_launch_extra_launch_commands.py | 2 +- .../TestDAP_launch_shellExpandArguments_enabled.py | 2 +- .../TestDAP_launch_stdio_redirection_and_console.py | 9 +-------- .../launch/TestDAP_launch_terminate_commands.py | 2 +- .../lldb-dap/launch/TestDAP_launch_win_debug_heap.py | 2 +- .../launch/io/TestDAP_launch_io_integratedTerminal.py | 8 +------- .../launch/io/TestDAP_launch_io_internalConsole.py | 2 +- .../API/tools/lldb-dap/locations/TestDAP_locations.py | 2 +- .../tools/lldb-dap/longpath/TestDAP_launch_longPath.py | 2 +- lldb/test/API/tools/lldb-dap/memory/TestDAP_memory.py | 4 ++-- .../lldb-dap/module-event/TestDAP_module_event.py | 7 ++----- lldb/test/API/tools/lldb-dap/module/TestDAP_module.py | 10 ++-------- .../lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py | 2 +- .../API/tools/lldb-dap/optimized/TestDAP_optimized.py | 4 ++-- lldb/test/API/tools/lldb-dap/output/TestDAP_output.py | 2 +- .../lldb-dap/repl-mode/TestDAP_repl_mode_detection.py | 2 +- .../test/API/tools/lldb-dap/restart/TestDAP_restart.py | 2 +- .../tools/lldb-dap/restart/TestDAP_restart_console.py | 8 +------- .../API/tools/lldb-dap/send-event/TestDAP_sendEvent.py | 2 +- lldb/test/API/tools/lldb-dap/server/TestDAP_server.py | 2 +- lldb/test/API/tools/lldb-dap/source/TestDAP_source.py | 2 +- .../lldb-dap/stackTrace-x86/TestDAP_source_x86.py | 2 +- .../tools/lldb-dap/stackTrace/TestDAP_stackTrace.py | 8 ++------ .../stackTrace/subtleFrames/TestDAP_subtleFrames.py | 2 +- .../TestDAP_stackTraceMissingFunctionName.py | 2 +- .../TestDAP_stackTraceMissingModule.py | 2 +- lldb/test/API/tools/lldb-dap/step/TestDAP_step.py | 2 +- .../lldb-dap/stepInTargets/TestDAP_stepInTargets.py | 2 +- .../lldb-dap/stopped-events/TestDAP_stopped_events.py | 8 +------- .../terminated-event/TestDAP_terminatedEvent.py | 5 +---- .../test/API/tools/lldb-dap/threads/TestDAP_threads.py | 2 +- .../tools/lldb-dap/utils/TestDAPUtils_EventHistory.py | 4 ++-- .../API/tools/lldb-dap/variables/TestDAP_variables.py | 7 +------ .../variables/children/TestDAP_variables_children.py | 2 +- 63 files changed, 70 insertions(+), 147 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..ffe3b77d2f5e5 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,7 +2,7 @@ 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 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..bd00ea0d39e21 100644 --- a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py +++ b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py @@ -7,13 +7,7 @@ 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, 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..b50dc48030418 100644 --- a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py +++ b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py @@ -6,7 +6,7 @@ from lldbgdbserverutils import Pipe from lldbsuite.test import lldbplatformutil -from lldbsuite.test.decorators import skipIfNetBSD, skipIfWasm, skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.types import AttachArgs 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..afe7da0b7168c 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,10 +5,7 @@ import os from typing import List -from lldbsuite.test.decorators import ( - skipIfTargetDoesNotSupportSharedLibraries, - skipIfWindows, -) +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.types import ( 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..bcfeae2dd6965 100644 --- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py +++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py @@ -4,10 +4,7 @@ import os -from lldbsuite.test.decorators import ( - skipIfTargetDoesNotSupportSharedLibraries, - skipIfWindows, -) +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.types import BreakpointLocation, LaunchArgs 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..635387f593cf7 100644 --- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_logpoints.py +++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_logpoints.py @@ -4,10 +4,7 @@ import os -from lldbsuite.test.decorators import ( - skipIfTargetDoesNotSupportSharedLibraries, - skipIfWindows, -) +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession from lldbsuite.test.tools.lldb_dap.types import ( @@ -16,7 +13,6 @@ StoppedEvent, ) - @skipIfTargetDoesNotSupportSharedLibraries() class TestDAP_logpoints(DAPTestCaseBase): def setUp(self): 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..30c4410b6c6ee 100644 --- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py +++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py @@ -6,11 +6,7 @@ import shutil from typing import Dict -from lldbsuite.test.decorators import ( - skipIfTargetDoesNotSupportSharedLibraries, - skipIfWasm, - skipIfWindows, -) +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.types import ( 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..adc805694e7c1 100644 --- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py +++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py @@ -2,10 +2,7 @@ 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, 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..3e5f835cbe273 100644 --- a/lldb/test/API/tools/lldb-dap/completions/TestDAP_completions.py +++ b/lldb/test/API/tools/lldb-dap/completions/TestDAP_completions.py @@ -7,7 +7,7 @@ from typing import Optional, Union -from lldbsuite.test.decorators import skipIf +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession from lldbsuite.test.tools.lldb_dap.types import ( @@ -16,7 +16,6 @@ StoppedReason, ) - session_completion = CompletionItem( label="session", detail="Commands controlling LLDB 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..ea59abbf7c5b0 100644 --- a/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py +++ b/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py @@ -6,7 +6,7 @@ import os import unittest -from lldbsuite.test.decorators import requireNotWindows, requireNotWasm +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap.types import LaunchArgs from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession 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..7357a6dcd6365 100644 --- a/lldb/test/API/tools/lldb-dap/databreakpoint/TestDAP_setDataBreakpoints.py +++ b/lldb/test/API/tools/lldb-dap/databreakpoint/TestDAP_setDataBreakpoints.py @@ -2,7 +2,7 @@ Test lldb-dap dataBreakpointInfo and setDataBreakpoints requests """ -from lldbsuite.test.decorators import requireNotWasm, skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.types import DataBreakpoint, LaunchArgs 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..8e9ed811eb045 100644 --- a/lldb/test/API/tools/lldb-dap/disassemble/TestDAP_disassemble.py +++ b/lldb/test/API/tools/lldb-dap/disassemble/TestDAP_disassemble.py @@ -2,7 +2,7 @@ Test lldb-dap disassemble request """ -from lldbsuite.test.decorators import skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..2ace6eeccc228 100644 --- a/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py +++ b/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py @@ -5,7 +5,7 @@ import re from typing import Optional, Union -from lldbsuite.test.decorators import skipIfWasm, skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.session_helpers import ExpectEval, FrameContext 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..e14c104efc45d 100644 --- a/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py +++ b/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py @@ -2,8 +2,8 @@ Test exception behavior in DAP with signal. """ +from lldbsuite.test.decorators import * from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase -from lldbsuite.test.decorators import requireSignals 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..05b4e4c7d98d5 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,7 +2,7 @@ Test exception behavior in DAP with c++ throw. """ -from lldbsuite.test.decorators import skipIfWasm, skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..85e0b9be28d34 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,9 +2,9 @@ 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 import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import ExceptionFilterOptions, LaunchArgs 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 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..c1b7c81abb194 100644 --- a/lldb/test/API/tools/lldb-dap/extendedStackTrace/TestDAP_extendedStackTrace.py +++ b/lldb/test/API/tools/lldb-dap/extendedStackTrace/TestDAP_extendedStackTrace.py @@ -4,7 +4,7 @@ import os -from lldbsuite.test.decorators import requireDarwin +from lldbsuite.test.decorators import * from lldbsuite.test.lldbplatformutil import findBacktraceRecordingDylib from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import 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..cb57d1e4d0aa9 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,7 +4,7 @@ import os -from lldbsuite.test.decorators import skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..0af875c8a4050 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,7 +4,7 @@ know about it. """ -from lldbsuite.test.decorators import skipIfWasm +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..3962e1b317edb 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,7 +2,7 @@ Test lldb-dap launch request. """ -from lldbsuite.test.decorators import skipIf +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..13d0ca2494536 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,7 +2,7 @@ Test lldb-dap launch request. """ -from lldbsuite.test.decorators import skipIf +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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_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..6ce40bcd9dcda 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,13 +3,7 @@ """ 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 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..f2dc50a13333c 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,7 +3,7 @@ """ 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 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..983e955a6944e 100644 --- a/lldb/test/API/tools/lldb-dap/locations/TestDAP_locations.py +++ b/lldb/test/API/tools/lldb-dap/locations/TestDAP_locations.py @@ -2,7 +2,7 @@ Test lldb-dap locations request """ -from lldbsuite.test.decorators import skipIf, skipIfWasm, skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..49aaa329aaab3 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,7 +7,7 @@ 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 diff --git a/lldb/test/API/tools/lldb-dap/memory/TestDAP_memory.py b/lldb/test/API/tools/lldb-dap/memory/TestDAP_memory.py index e9adf6921b373..d2422129afdc4 100644 --- a/lldb/test/API/tools/lldb-dap/memory/TestDAP_memory.py +++ b/lldb/test/API/tools/lldb-dap/memory/TestDAP_memory.py @@ -5,9 +5,9 @@ from base64 import b64decode from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * +from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession -from lldbsuite.test.tools.lldb_dap.types import * +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs class TestDAP_memory(DAPTestCaseBase): 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..ded4e126ecd35 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,10 +1,7 @@ -from lldbsuite.test.decorators import ( - skipIfTargetDoesNotSupportSharedLibraries, - skipIfWindows, -) +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number -from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StoppedReason from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs @skipIfTargetDoesNotSupportSharedLibraries() 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..945782ba0377b 100644 --- a/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py +++ b/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py @@ -5,21 +5,15 @@ import platform import re -from lldbsuite.test.decorators import ( - requireDarwin, - skipIf, - skipIfWindows, - skipIfTargetDoesNotSupportSharedLibraries, -) -import lldbsuite.test.lldbplatformutil as lldbplatformutil +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.types import ( CompileUnitsArgs, LaunchArgs, ModuleEvent, ModuleReason, ) -from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase @skipIfTargetDoesNotSupportSharedLibraries() 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..7c6e1d95b45f8 100644 --- a/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py +++ b/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py @@ -2,7 +2,7 @@ Test lldb-dap moduleSymbols request """ -from lldbsuite.test.decorators import skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, ModuleSymbolsArgs 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..3e8429866db46 100644 --- a/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py +++ b/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py @@ -2,10 +2,10 @@ Test lldb-dap variables/stackTrace request for optimized code """ -from lldbsuite.test.decorators import skipIfAsan, skipIfWasm, skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number -from lldbsuite.test.tools.lldb_dap.types import LaunchArgs from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs class TestDAP_optimized(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..46e50e9cc7721 100644 --- a/lldb/test/API/tools/lldb-dap/output/TestDAP_output.py +++ b/lldb/test/API/tools/lldb-dap/output/TestDAP_output.py @@ -2,7 +2,7 @@ Test lldb-dap output events """ -from lldbsuite.test.decorators import skipIfWasm, skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..23fa433c0f8f0 100644 --- a/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart.py +++ b/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart.py @@ -2,7 +2,7 @@ Test lldb-dap RestartRequest. """ -from lldbsuite.test.decorators import skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..f0239d8dd25d8 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,13 +2,7 @@ Test lldb-dap RestartRequest. """ -from lldbsuite.test.decorators import ( - skipIf, - skipIfAsan, - skipIfBuildType, - skipIfWasm, - skipIfWindows, -) +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..0045cdec6a90d 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,7 +6,7 @@ from dataclasses import dataclass from typing import List, Optional -from lldbsuite.test.decorators import skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.types import Event, LaunchArgs, message_to_dict diff --git a/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py b/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py index cf9b0c47744e8..e756499f5afe4 100644 --- a/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py +++ b/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py @@ -33,7 +33,7 @@ def cleanup(): try: process.stdin.close() process.wait(timeout=5) - except TimeoutExpired: + except subprocess.TimeoutExpired: process.kill() self.addTearDownHook(cleanup) 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..e5c28fb2216ed 100644 --- a/lldb/test/API/tools/lldb-dap/source/TestDAP_source.py +++ b/lldb/test/API/tools/lldb-dap/source/TestDAP_source.py @@ -2,7 +2,7 @@ Test lldb-dap source request """ -from lldbsuite.test.decorators import skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, Source, SourceArgs 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..65277373e3a6b 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,7 +3,7 @@ """ from lldbsuite.test import lldbplatformutil -from lldbsuite.test.decorators import skipUnlessArch, skipUnlessPlatform +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..7909f92ec7414 100644 --- a/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py +++ b/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py @@ -5,14 +5,10 @@ import os from typing import List, NamedTuple -from lldbsuite.test.decorators import skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number -from lldbsuite.test.tools.lldb_dap.types import ( - LaunchArgs, - StackFrame, - StackFrameFormat, -) from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase +from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StackFrame, StackFrameFormat class _RecurseSource(NamedTuple): 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..f28bf9cdd6521 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,7 +2,7 @@ Test lldb-dap stack trace response """ -from lldbsuite.test.decorators import add_test_categories +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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/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..9df4d16eb42b8 100644 --- a/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py +++ b/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py @@ -4,7 +4,7 @@ import re -from lldbsuite.test.decorators import skipUnlessPlatform +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..0744ad3898c8e 100644 --- a/lldb/test/API/tools/lldb-dap/step/TestDAP_step.py +++ b/lldb/test/API/tools/lldb-dap/step/TestDAP_step.py @@ -2,7 +2,7 @@ Test lldb-dap setBreakpoints request """ -from lldbsuite.test.decorators import skipIfWindows +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..a817892bec0eb 100644 --- a/lldb/test/API/tools/lldb-dap/stepInTargets/TestDAP_stepInTargets.py +++ b/lldb/test/API/tools/lldb-dap/stepInTargets/TestDAP_stepInTargets.py @@ -2,7 +2,7 @@ Test lldb-dap stepInTargets request """ -from lldbsuite.test.decorators import expectedFailureAll, no_match, skipIf +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..a1fd2347b8228 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,13 +4,7 @@ from typing import Sequence -from lldbsuite.test.decorators import ( - expectedFailureAll, - expectedFailureNetBSD, - requireThreadSupport, - skipIfLinux, - skipIfWindows, -) +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..fc2e130f70812 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,10 +4,7 @@ import json -from lldbsuite.test.decorators import ( - skipIfTargetDoesNotSupportSharedLibraries, - skipIfWindows, -) +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..ab4e663318e41 100644 --- a/lldb/test/API/tools/lldb-dap/threads/TestDAP_threads.py +++ b/lldb/test/API/tools/lldb-dap/threads/TestDAP_threads.py @@ -2,7 +2,7 @@ Test lldb-dap threads request """ -from lldbsuite.test.decorators import requireThreadSupport +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number 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..4ebcefca84f5d 100644 --- a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py +++ b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py @@ -1,7 +1,8 @@ import json import threading -from typing import List, Union +from typing import List +from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.types import ( CapabilitiesEvent, DAPError, @@ -14,7 +15,6 @@ ProgressEndEvent, TerminatedEvent, ) -from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase from lldbsuite.test.tools.lldb_dap.utils import EventHistory 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..b11ebd225cd21 100644 --- a/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py +++ b/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py @@ -6,12 +6,7 @@ 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.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap.types import ( EvaluateContext, 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..fae2de35f013d 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,4 +1,4 @@ -from lldbsuite.test.decorators import expectedFailureAll, skipIfWasm +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import line_number from lldbsuite.test.tools.lldb_dap.types import LaunchArgs from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
