From c00704912bc293f2305ef4427446bb6ec8ede93c Mon Sep 17 00:00:00 2001 From: Augusto Noronha Date: Tue, 28 Jul 2026 15:00:15 -0700 Subject: [PATCH 1/2] [lldb] Discern embedded swift tests that can't run vs buggy ones `@skipEmbeddedSwift` doesn't really tell us if the test is skipped because there's a bug vs tests that simply can't run in embedded swift mode (for example, dylibs, objc interop, resiliency, etc). Introduce requiresNonEmbeddedSwift to mean "this can't run in embedded swift mode" and leave skipEmbeddedSwift to identify tests that should be fixed. The split was measured by removing every annotation and running check-lldb-swift in the swiftembed variant: annotations test files moved to requiresNonEmbeddedSwift 369 284 narrowed to skipEmbeddedSwiftOnLinux 2 2 removed, the test already passes 21 16 kept as skipEmbeddedSwift (a bug to fix) 83 73 ----------- ---------- before 475 371 The test-file column adds up to more than 371 because four files have annotations in more than one row. That first measurement only covered macOS arm64. CI also covers macOS x86_64 and Linux x86_64, where four of the tests it had cleared still fail, so those keep an annotation: TestSwiftArchetypeResolution skipEmbeddedSwiftOnLinux: the inferior does not link, undefined reference to arc4random_buf from the embedded stdlib's hashing seed. TestSwiftCommandMemoryFind skipEmbeddedSwiftOnLinux: `memory find -e` reports "data not found within the range". TestSwiftStepping skipEmbeddedSwift: steps to line 174 instead of 172 on x86_64, and hits the same arc4random_buf link failure on Linux. TestSwiftTypes skipEmbeddedSwift: `frame variable --raw float80` crashes LLDB with "80 != 128". Float80 only exists on x86_64, which is why arm64 passed. Assisted-by: claude --- .../Python/lldbsuite/test/decorators.py | 24 +++++++++++++++++++ .../dwim-print/swift/TestSwiftDWIMPrint.py | 6 ++--- .../swift/TestSwiftFrameVarDirectIvar.py | 4 ++-- .../asan/swift/TestSwiftAsan.py | 2 +- .../TestExpressionErrorBreakpoint.py | 8 +++---- .../TestSwiftBridgedStringFormatters.py | 2 +- .../swift/date/TestSwiftDateFormatters.py | 2 +- .../TestSwiftStringIndexFormatters.py | 4 ++-- .../substring/TestSwiftSubstringFormatters.py | 2 +- .../swift-property/TestSwiftMTCProperty.py | 2 +- .../functionalities/mtc/swift/TestSwiftMTC.py | 2 +- .../TestSwiftProgressReporting.py | 2 +- .../TestExclusivityViolation.py | 2 +- .../TestSwiftTsanAccessRace.py | 2 +- .../tsan/swift/TestSwiftTsan.py | 2 +- .../accelerate_simd/TestAccelerateSIMD.py | 2 +- .../swift/address_of/TestSwiftAddressOf.py | 2 +- .../API/lang/swift/any/TestSwiftAnyType.py | 1 - .../TestSwiftArchetypeResolution.py | 2 +- .../TestArchetypeResolutionSubclass.py | 2 +- .../TestArrayBridgedEnum.py | 2 +- .../array_element/TestSwiftArrayElement.py | 2 +- .../lang/swift/array_enum/TestArrayEnum.py | 2 +- .../TestSwiftArrayTupleResilient.py | 2 +- .../TestSwiftArrayUninitialized.py | 2 +- .../TestSwiftArtificialSubclass.py | 2 +- .../TestSwiftAssociatedSelfType.py | 2 +- .../TestSwiftAssociatedTypeResolution.py | 2 +- .../TestSwiftActorUnprioritisedJobs.py | 2 +- .../async_fnargs/TestSwiftAsyncFnArgs.py | 2 +- .../TestSwiftContinuationSynthetic.py | 4 ++-- .../async/expr/TestSwiftAsyncExpressions.py | 2 +- .../task/TestSwiftTaskSyntheticProvider.py | 4 ++-- .../TestSwiftSyntheticTaskChildren.py | 2 +- .../task/complete/TestSwiftTaskComplete.py | 2 +- .../formatters/task/name/TestSwiftTaskName.py | 4 ++-- .../parent/TestSwiftSyntheticTaskParent.py | 2 +- .../task/suspended/TestSwiftTaskSuspended.py | 2 +- .../TestSwiftTaskPrioritySummary.py | 2 +- .../frame/variable/TestSwiftAsyncFrameVar.py | 2 +- .../TestSwiftAsyncFrameVarMultipleFrames.py | 2 +- .../async/queues/TestSwiftPluginQueues.py | 2 +- .../stepping/step-in/TestSwiftStepInAsync.py | 2 +- .../task-switch/TestSwiftTaskSwitch.py | 2 +- .../stepping/step_out/TestSteppingOutAsync.py | 2 +- .../step_over/TestSwiftAsyncStepOver.py | 4 ++-- .../TestSwiftAsyncStepOverAsyncLet.py | 4 ++-- .../taskgroups/TestSwiftTaskGroupSynthetic.py | 8 +++---- .../async/tasks/TestSwiftTaskBacktrace.py | 4 ++-- .../swift/async/tasks/TestSwiftTaskSelect.py | 8 +++---- .../async/tasks/info/TestSwiftTaskInfo.py | 4 ++-- .../async/tasks/list/TestSwiftTaskList.py | 2 +- .../async/tasks/tree/TestSwiftTaskTree.py | 2 +- .../TestDisableLanguageUnwinder.py | 2 +- .../TestSwiftAsyncHiddenFrames.py | 2 +- .../unwind/sayhello/TestSwiftAsyncUnwind.py | 2 +- .../short_unwind/TestSwiftShortAsyncUnwind.py | 2 +- .../TestSwiftAsyncUnwindAllInstructions.py | 2 +- .../TestSwiftAsyncUnwindRecursiveQFunclets.py | 2 +- .../TestSwiftAsyncUnwindRegisterPressure.py | 2 +- .../variables/TestSwiftAsyncVariables.py | 2 +- .../TestSwiftAsyncBreakpoints.py | 2 +- ...stSwiftAsyncBreakpointsOverManyFunclets.py | 2 +- .../availability/TestSwiftAvailability.py | 2 +- .../TestSwiftBridgedMetatype.py | 2 +- .../swift/bridged_url/TestSwiftBridgedURL.py | 2 +- .../c_compat_enum/TestSwiftCCompatEnum.py | 1 - .../test/API/lang/swift/cf/uuid/TestCFUUID.py | 2 +- .../TestSwiftBridgingHeaderHeadermap.py | 2 +- .../caching/TestSwiftClangImporterCaching.py | 1 - .../TestSwiftNSClassBaseClass.py | 2 +- .../config_macros/TestSwiftDedupMacros.py | 2 +- .../TestSwiftClangImporterCustomAlignment.py | 2 +- ...wiftDynamicTypeResolutionImportConflict.py | 2 +- ...estSwiftClangImporterExplicitNoImplicit.py | 2 +- .../TestSwiftClangImporterExtraInhabitants.py | 2 +- .../TestSwiftHardMacroConflict.py | 2 +- .../TestSwiftHeadermapConflict.py | 2 +- .../TestSwiftIncludeConflict.py | 2 +- .../missing_pch/TestSwiftMissingPCH.py | 2 +- .../clangimporter/nserror/TestNSError.py | 2 +- .../TestSwiftNSIntegerNSEnum.py | 4 ++-- .../TestSwiftObjCDynamicType.py | 2 +- .../TestSwiftObjCBaseClassMemberLookup.py | 2 +- .../TestSwiftAtObjCIvars.py | 2 +- .../TestObjCInternalPropertyRedecl.py | 2 +- .../TestSwiftObjCOptionalDict.py | 2 +- .../objc_protocol/TestSwiftObjCProtocol.py | 2 +- .../TestSwiftObjCProtocolFields.py | 2 +- .../TestObjCIvarDiscovery.py | 4 ++-- ...ObjCMainConflictingDylibsBridgingHeader.py | 2 +- ...tObjCMainConflictingDylibsFailingImport.py | 2 +- .../TestSwiftClangOverrideOptions.py | 2 +- ...stSwiftClangImporterProtocolComposition.py | 2 +- .../TestSwiftRemoteASTImport.py | 2 +- .../TestSwiftRewriteClangPaths.py | 4 ++-- .../TestSwiftStaticArchiveTwoSwiftmodules.py | 2 +- .../submodules/TestSwiftSubmoduleImport.py | 2 +- .../TestSwiftClashingABIName.py | 4 ++-- .../lang/swift/class_error/TestClassError.py | 2 +- .../closure_shortcuts/TestClosureShortcuts.py | 2 +- .../TestSwiftClosureVarNotCaptured.py | 14 +++++------ .../TestSwiftCommandMemoryFind.py | 2 +- .../TestSwiftMemoryRead.py | 2 +- ...tSwiftConstrainedExistentialMetatypeFix.py | 2 +- .../TestSwiftConventionCFunctionPointer.py | 1 - .../TestSwiftBackwardInteropExpressions.py | 2 +- ...wiftBackwardInteropSteppingClass_part01.py | 8 +++---- ...wiftBackwardInteropSteppingClass_part02.py | 8 +++---- ...wiftBackwardInteropSteppingClass_part03.py | 8 +++---- .../TestSwiftBackwardInteropSteppingFunc.py | 4 ++-- ...iftBackwardInteropSteppingStruct_part01.py | 8 +++---- ...iftBackwardInteropSteppingStruct_part02.py | 8 +++---- ...iftBackwardInteropSteppingStruct_part03.py | 4 ++-- .../TestSwiftForwardInteropCxxClass.py | 2 +- .../TestSwiftForwardInteropSTLTypes.py | 2 +- .../TestSwiftDeploymentTarget.py | 8 +++---- .../TestSwiftDeserializationFailure.py | 4 ++-- .../TestSwiftDifferentABIName.py | 2 +- .../Objective-C/TestSwiftDWARFImporterObjC.py | 6 ++--- .../TestSwiftDWARFImporter-Swift.py | 2 +- .../enable_testing/TestSwiftEnableTesting.py | 2 +- .../enum_as_value/TestSwiftEnumAsValue.py | 2 +- .../lang/swift/enum_objc/TestSwiftEnumObjC.py | 2 +- .../TestSwiftDecodingErrorEnum.py | 2 +- .../TestSwiftErrorHandlingMissingType.py | 2 +- .../TestSwiftExplicitModulesBridgingHeader.py | 4 ++-- ...icitModulesBridgingHeaderCaching_part01.py | 2 +- ...icitModulesBridgingHeaderCaching_part02.py | 2 +- .../caching/TestSwiftExplicitModuleCaching.py | 1 - ...iftExplicitModulesChainedBridgingHeader.py | 2 +- ...estSwiftExplicitModulesImplicitFallback.py | 6 ++--- ...stSwiftExplicitModulePrivateTypeGeneric.py | 2 +- .../simple/TestSwiftExplicitModules_part01.py | 4 ++-- .../simple/TestSwiftExplicitModules_part02.py | 2 +- .../actor/TestSwiftExpressionActor.py | 4 ++-- .../allocator/TestSwiftExprAllocator.py | 2 +- .../TestClassConstrainedProtocol.py | 8 +++---- .../TestSwiftExpressionsInMethodsFromObjc.py | 2 +- .../TestSwiftExpressionOpenResilientClass.py | 2 +- .../TestEqualityOperators.py | 4 ++-- .../TestSwiftExpressionErrorReporting.py | 4 +--- .../TestGenericProtocolExtension.py | 2 +- .../TestSwiftExpressionObjCContext.py | 2 +- .../TestOptionalAmbiguity.py | 2 +- .../TestSwiftProtocolExtensionSelf.py | 2 +- .../expression/scopes/TestExpressionScopes.py | 2 +- .../simple/TestSwiftSimpleExpressions.py | 2 +- .../TestSwiftWeakGenericSelf.py | 2 +- .../expression/weak_self/TestWeakSelf.py | 2 +- .../swift/file_private/TestFilePrivate.py | 2 +- .../TestSwiftFirstExprModuleLoad.py | 2 +- .../swift/foundation/TestSwiftFoundation.py | 2 +- .../TestSwiftFoundationTypeCFStringRef.py | 2 +- .../data/TestSwiftFoundationTypeData.py | 2 +- .../date/TestSwiftFoundationTypeDate.py | 2 +- .../decimal/TestSwiftFoundationTypeDecimal.py | 2 +- .../global/TestSwiftFoundationTypeGlobal.py | 2 +- .../TestSwiftFoundationTypeIndexPath.py | 2 +- .../TestSwiftFoundationTypeMeasurement.py | 4 ++-- .../TestSwiftSharedStringStorage.py | 2 +- .../url/TestSwiftFoundationTypeURL.py | 2 +- .../uuid/TestSwiftFoundationTypeUUID.py | 2 +- .../TestSwiftFrameworkPaths.py | 2 +- .../TestSwiftGenericArgInExtension.py | 2 +- .../TestSwiftGenericArgumentTypes.py | 2 +- .../generic_class/TestSwiftGenericClass.py | 1 - .../TestGenericObjcClassWrapper.py | 2 +- .../TestGenericStructWithOptional.py | 2 +- .../TestSwiftGenericTypeOfNestedArchetype.py | 2 +- .../generics/TestSwiftGenericsResolution.py | 2 +- ...TestHashedContainerStoringNestedGeneric.py | 2 +- .../TestSwiftHashedContainerEnum.py | 2 +- .../TestSwiftHideRuntimeSupport.py | 2 +- .../library_indirect/TestLibraryIndirect.py | 4 ++-- .../library_resilient/TestLibraryResilient.py | 4 ++-- .../main_executable/TestMainExecutable.py | 4 ++-- .../cgtypes/TestCGImportedTypes.py | 2 +- .../TestSwiftInstancePointerSetSP.py | 2 +- .../swift/late_dylib/TestSwiftLateDylib.py | 2 +- .../TestSwiftLateDylibClangDeps.py | 2 +- .../late_expr_dylib/TestSwiftLateExprDylib.py | 2 +- .../TestSwiftLateSwiftDylibClangDeps.py | 2 +- .../late_symbols/TestSwiftLateSymbols.py | 1 - .../API/lang/swift/macro/TestSwiftMacro.py | 4 ++-- .../TestMarkerProtocolExistential.py | 10 ++++---- .../TestSwiftMaterializerArchetypeBinding.py | 2 +- .../test/API/lang/swift/meta/TestSwiftMeta.py | 1 - .../metadata_cache/TestSwiftMetadataCache.py | 2 +- .../lang/swift/metatype/TestSwiftMetatype.py | 2 +- .../TestSwiftMixAnyObjectType.py | 2 +- .../multi_optionals/TestMultiOptionals.py | 2 +- .../TestMultilangFormatterCategories.py | 2 +- .../nested_c_enums/TestSwiftNestedCEnums.py | 2 +- .../nested_generic/TestSwiftNestedGeneric.py | 2 +- .../TestNestedMarkerProtocolExistential.py | 2 +- .../swift/no_runtime/TestSwiftNoRuntime.py | 2 +- .../TestSwiftNSArrayCodeRunningFormatter.py | 2 +- .../TestSwiftObjCImplementation.py | 2 +- .../objc_obj_field/TestSwiftObjCObjField.py | 2 +- .../objc_protocol/TestSwiftObjcProtocol.py | 2 +- .../TestSwiftObjCSuperClassNoDebugInfo.py | 2 +- .../swift/observation/TestSwiftObservation.py | 2 +- .../one_case_enum/TestSwiftOneCaseEnum.py | 2 +- .../TestOpaqueExistentials.py | 2 +- .../opaque_return/TestBoundOpaqueArchetype.py | 2 +- .../TestSwiftGlobalOpaque.py | 2 +- .../TestSwiftOpaqueReturnResilient.py | 2 +- ...estSwiftOpaqueReturnResilientCollection.py | 2 +- .../TestOpaqueReturnTypes.py | 2 +- .../swift/opaque_type/TestSwiftOpaqueType.py | 1 - .../TestSwiftOptionalErrorHandling.py | 2 +- .../TestResilientObjectInOptional.py | 2 +- .../swift/optional_url/TestOptionalURL.py | 2 +- .../swift/optionset/TestSwiftOptionSetType.py | 2 +- .../TestSwiftOriginallyDefinedInPayload.py | 2 +- .../TestSwiftOtherArchDylib.py | 2 +- .../dsym/TestSwiftInterfaceDsym.py | 6 ++--- .../TestSwiftInterfaceNoDebugInfo_part01.py | 2 +- .../TestSwiftInterfaceNoDebugInfo_part02.py | 2 +- .../TestSwiftInterfaceNoDebugInfo_part03.py | 2 +- ...tSwiftInterfaceStaticNoDebugInfo_part01.py | 2 +- ...tSwiftInterfaceStaticNoDebugInfo_part02.py | 2 +- .../TestSwiftPartiallyGenericFuncClass.py | 2 +- ...stSwiftPartiallyGenericFuncContinuation.py | 2 +- .../enum/TestSwiftPartiallyGenericFuncEnum.py | 2 +- .../TestSwiftPartiallyGenericFuncStruct.py | 2 +- .../old_playground/TestNonREPLPlayground.py | 2 +- .../swift/playgrounds/TestSwiftPlaygrounds.py | 8 +++---- .../TestSwiftPONestedNSDictionary.py | 2 +- .../API/lang/swift/po/objc/TestSwiftPOObjC.py | 2 +- ...iftPrintObjectPointerAndTypeName_part01.py | 2 -- ...iftPrintObjectPointerAndTypeName_part03.py | 4 ---- .../recursive/TestSwiftPORecursiveBehavior.py | 2 +- .../swift/po/ref_types/TestSwiftPORefTypes.py | 2 +- .../static_method/TestSwiftPoInClassMethod.py | 2 +- .../swift/po/sys_types/TestSwiftPOSysTypes.py | 2 +- .../swift/po/val_types/TestSwiftPOValTypes.py | 4 ++-- .../TestSwiftPrivateDeclName.py | 2 +- .../TestSwiftPrivateDiscriminator.py | 2 +- .../TestSwiftPrivateGenericSelf.py | 2 +- .../TestSwiftPrivateGenericType.py | 2 +- .../private_import/TestSwiftPrivateImport.py | 2 +- .../private_member/TestSwiftPrivateMember.py | 2 +- .../private_self/TestSwiftPrivateSelf.py | 2 +- .../TestSwiftPrivateTypeAlias.py | 2 +- .../TestProtocolExtensionComputerProperty.py | 2 +- .../TestSwiftProtocolOptional.py | 2 +- ...stSwiftClassConstrainedProtocolArgument.py | 2 +- .../TestSwiftSteppingThroughWitness.py | 4 ++-- .../TestSwiftReferenceStorageTypes.py | 2 +- .../TestSwiftReflectionLoading.py | 2 +- .../TestSwiftReflectionOnly.py | 2 +- .../lang/swift/regex/TestSwiftRegexExpr.py | 2 +- .../swift/regex/TestSwiftRegexExprDesc.py | 2 +- .../swift/regex/TestSwiftRegexFrameVar.py | 2 +- .../swift/regex/TestSwiftRegexFrameVarDesc.py | 2 +- .../lang/swift/regex/TestSwiftRegexInExp.py | 2 +- .../swift/resilience/TestSwiftResilience.py | 8 +++---- .../TestSwiftResilienceOtherModule.py | 4 ++-- .../TestSwiftResiliencePrivateField.py | 2 +- .../TestSwiftResiliencePrivateMethod.py | 2 +- .../TestSwiftResilienceSuperclass.py | 2 +- .../TestSwiftResilienceSuperclassMod.py | 2 +- .../TestSwiftResilienceSuperclassOtherMod.py | 2 +- .../TestSwiftResilienceSwiftInterface.py | 2 +- .../macOS/TestSwiftStaticLinkingMacOS.py | 2 +- .../TestStepIntoObjCInteropInit.py | 2 +- .../TestStepFromObjCToSwiftOverride.py | 2 +- .../lang/swift/stepping/TestSwiftStepping.py | 2 +- .../TestSwiftSubstitutedTypeAlias.py | 2 +- .../TestSwiftArrayOfObjCItems.py | 2 +- .../TestSwiftieFormatting.py | 2 +- .../TestSwiftUIFormatters.py | 6 ++--- .../TestSwiftSymbolicExtendedExistential.py | 2 +- .../swift/system/TestSwiftSystemFilePath.py | 2 +- .../TestSwiftSystemFramework.py | 2 +- .../tagged_pointer/TestSwiftTaggedPointer.py | 2 +- .../type_metadata/TestSwiftTypeMetadata.py | 2 +- .../TestSwiftTypeAliasOthermodule.py | 4 ++-- ...iftObjCDescendantClassWithoutASTContext.py | 2 +- .../API/lang/swift/union/TestSwiftCUnion.py | 1 - .../TestSwiftUnknownReference.py | 2 +- .../unknown_self/TestSwiftUnknownSelf.py | 2 +- .../variables/actor/TestSwiftActorTypes.py | 2 +- .../TestSwiftBridgedStringVariables.py | 2 +- .../bulky_enums/TestBulkyEnumsVariables.py | 2 +- .../swift/variables/cgtypes/TestCGTypes.py | 2 +- .../TestSwiftConsumeOperatorAsync.py | 2 +- .../TestSwiftDictionaryNSObjectAnyObject.py | 2 +- .../dictionary/TestSwiftStdlibDictionary.py | 2 +- .../generic_enums/TestSwiftGenericEnums.py | 2 +- ...SwiftGenericStructDebugInfoGenericArray.py | 2 +- ...iftGenericStructDebugInfoGenericFlatMap.py | 2 +- .../TestSwiftGenericTupleLabels.py | 2 +- .../generics/TestSwiftGenericTypes.py | 2 +- .../variables/inout/TestInOutVariables.py | 2 +- .../objc/TestSwiftObjCImportedTypes.py | 2 +- .../objc_optionals/TestSwiftObjCOptionals.py | 2 +- .../swift/variables/swift/TestSwiftTypes.py | 2 +- .../TestSwiftUninitializedVariable.py | 2 +- .../TestSwiftValueOfOptionals.py | 2 +- .../TestSwiftVariadicGenerics.py | 2 +- .../TestSwiftCPPExceptionsInREPL.py | 2 +- 304 files changed, 400 insertions(+), 394 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py index 75ac18d68c39d..62ab13958462d 100644 --- a/lldb/packages/Python/lldbsuite/test/decorators.py +++ b/lldb/packages/Python/lldbsuite/test/decorators.py @@ -1085,12 +1085,36 @@ def decorate(func): return decorate def skipEmbeddedSwift(func): + """Skip a test that ought to work in embedded Swift but currently doesn't. + + Use this when the test's inferior builds and runs as embedded Swift and the + debugger is what gets the wrong answer -- i.e. a gap in LLDB's embedded + support that is expected to be closed. For a test whose own source cannot be + compiled as embedded Swift at all, use `requiresNonEmbeddedSwift` instead so + the two populations stay distinguishable. + """ def skip_fn(swift_embedded=None, **kwargs): if swift_embedded == "swiftembed": return "not supported in embedded Swift" return None return _skipForVariant("swift_embedded", skip_fn, func) +def requiresNonEmbeddedSwift(func): + """Skip a test whose own source requires non-embedded Swift. + + Behaves exactly like `skipEmbeddedSwift`; the separate name records that the + test cannot run as embedded Swift because the inferior does not compile in + that mode -- it imports Foundation or another ObjC module, enables library + evolution, uses `_Concurrency`, or relies on a language feature Embedded + Swift rejects. Nothing in LLDB can make these pass, so they should not be + counted against embedded debugging support. + """ + def skip_fn(swift_embedded=None, **kwargs): + if swift_embedded == "swiftembed": + return "test requires non-embedded Swift" + return None + return _skipForVariant("swift_embedded", skip_fn, func) + def skipEmbeddedSwiftOnLinux(func): def skip_fn(swift_embedded=None, **kwargs): if swift_embedded == "swiftembed" and lldbplatformutil.getPlatform() == "linux": diff --git a/lldb/test/API/commands/dwim-print/swift/TestSwiftDWIMPrint.py b/lldb/test/API/commands/dwim-print/swift/TestSwiftDWIMPrint.py index cc468e1f3de2f..dbd5c6d5c945d 100644 --- a/lldb/test/API/commands/dwim-print/swift/TestSwiftDWIMPrint.py +++ b/lldb/test/API/commands/dwim-print/swift/TestSwiftDWIMPrint.py @@ -8,7 +8,7 @@ import lldbsuite.test.lldbutil as lldbutil class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_swift_po_address(self): self.build() @@ -21,7 +21,7 @@ def test_swift_po_address(self): self.expect(f"dwim-print -O -- 0x{hex_addr}", patterns=[f"Object@0x0*{hex_addr}"]) self.expect(f"dwim-print -O -- {addr}", patterns=[f"Object@0x0*{hex_addr}"]) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_swift_po_non_address_hex(self): """No special handling of non-memory integer values.""" @@ -31,7 +31,7 @@ def test_swift_po_non_address_hex(self): ) self.expect(f"dwim-print -O -- 0x1000", substrs=["4096"]) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_print_swift_object_does_not_show_name(self): """Ensure that objects are printed without a name, and without the '=' diff --git a/lldb/test/API/commands/frame/var/direct-ivar/swift/TestSwiftFrameVarDirectIvar.py b/lldb/test/API/commands/frame/var/direct-ivar/swift/TestSwiftFrameVarDirectIvar.py index ea66f84fb9ee1..a92fc11f46159 100644 --- a/lldb/test/API/commands/frame/var/direct-ivar/swift/TestSwiftFrameVarDirectIvar.py +++ b/lldb/test/API/commands/frame/var/direct-ivar/swift/TestSwiftFrameVarDirectIvar.py @@ -5,7 +5,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipUnlessDarwin def test_objc_self(self): @@ -13,7 +13,7 @@ def test_objc_self(self): lldbutil.run_to_source_breakpoint(self, "check self", lldb.SBFileSpec("main.swift")) self.expect("frame variable _prop", startstr="(Int) _prop = 30") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipUnlessDarwin def test_objc_self_capture_idiom(self): diff --git a/lldb/test/API/functionalities/asan/swift/TestSwiftAsan.py b/lldb/test/API/functionalities/asan/swift/TestSwiftAsan.py index 257e626797332..b754e331874dc 100644 --- a/lldb/test/API/functionalities/asan/swift/TestSwiftAsan.py +++ b/lldb/test/API/functionalities/asan/swift/TestSwiftAsan.py @@ -25,7 +25,7 @@ class AsanSwiftTestCase(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIfWindows @skipIfLinux diff --git a/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py b/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py index 53ed9659d3c11..05ab926dfdc45 100644 --- a/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py +++ b/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py @@ -21,7 +21,7 @@ @skipIfWindows class TestSwiftErrorBreakpoint(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @decorators.skipIfLinux # @swiftTest def test_swift_error_no_typename(self): @@ -29,21 +29,21 @@ def test_swift_error_no_typename(self): self.build() self.do_tests(None) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_swift_error_matching_base_typename(self): """Tests that swift error throws are correctly caught by the Swift Error breakpoint""" self.build() self.do_tests("EnumError") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_swift_error_matching_full_typename(self): """Tests that swift error throws are correctly caught by the Swift Error breakpoint""" self.build() self.do_tests("a.EnumError") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_swift_error_bogus_typename(self): """Tests that swift error throws are correctly caught by the Swift Error breakpoint""" diff --git a/lldb/test/API/functionalities/data-formatter/swift/bridged-string/TestSwiftBridgedStringFormatters.py b/lldb/test/API/functionalities/data-formatter/swift/bridged-string/TestSwiftBridgedStringFormatters.py index 636b0430080e5..035b42496917c 100644 --- a/lldb/test/API/functionalities/data-formatter/swift/bridged-string/TestSwiftBridgedStringFormatters.py +++ b/lldb/test/API/functionalities/data-formatter/swift/bridged-string/TestSwiftBridgedStringFormatters.py @@ -6,7 +6,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipUnlessFoundation def test(self): diff --git a/lldb/test/API/functionalities/data-formatter/swift/date/TestSwiftDateFormatters.py b/lldb/test/API/functionalities/data-formatter/swift/date/TestSwiftDateFormatters.py index 1cd30a9fb64bc..4fd698532bc65 100644 --- a/lldb/test/API/functionalities/data-formatter/swift/date/TestSwiftDateFormatters.py +++ b/lldb/test/API/functionalities/data-formatter/swift/date/TestSwiftDateFormatters.py @@ -11,7 +11,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessFoundationEssentials @skipIfLinux # https://github.com/swiftlang/llvm-project/issues/13465 @swiftTest diff --git a/lldb/test/API/functionalities/data-formatter/swift/string-index/TestSwiftStringIndexFormatters.py b/lldb/test/API/functionalities/data-formatter/swift/string-index/TestSwiftStringIndexFormatters.py index 1dfbc463edaa9..723370af1be7c 100644 --- a/lldb/test/API/functionalities/data-formatter/swift/string-index/TestSwiftStringIndexFormatters.py +++ b/lldb/test/API/functionalities/data-formatter/swift/string-index/TestSwiftStringIndexFormatters.py @@ -11,7 +11,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessFoundationEssentials @skipIfLinux # https://github.com/swiftlang/llvm-project/issues/13465 @swiftTest @@ -77,7 +77,7 @@ def test_swift_string_index_formatters_native(self): ], ) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessFoundation @swiftTest def test_swift_string_index_formatters_bridged(self): diff --git a/lldb/test/API/functionalities/data-formatter/swift/substring/TestSwiftSubstringFormatters.py b/lldb/test/API/functionalities/data-formatter/swift/substring/TestSwiftSubstringFormatters.py index 86b0c60d2a3eb..164949ef8f587 100644 --- a/lldb/test/API/functionalities/data-formatter/swift/substring/TestSwiftSubstringFormatters.py +++ b/lldb/test/API/functionalities/data-formatter/swift/substring/TestSwiftSubstringFormatters.py @@ -9,7 +9,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_swift_substring_formatters(self): """Test Subtring summary strings.""" diff --git a/lldb/test/API/functionalities/mtc/swift-property/TestSwiftMTCProperty.py b/lldb/test/API/functionalities/mtc/swift-property/TestSwiftMTCProperty.py index 3591d8514165e..7afa44672d400 100644 --- a/lldb/test/API/functionalities/mtc/swift-property/TestSwiftMTCProperty.py +++ b/lldb/test/API/functionalities/mtc/swift-property/TestSwiftMTCProperty.py @@ -13,7 +13,7 @@ class MTCSwiftPropertyTestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): diff --git a/lldb/test/API/functionalities/mtc/swift/TestSwiftMTC.py b/lldb/test/API/functionalities/mtc/swift/TestSwiftMTC.py index 14fba642452b4..db25431c81269 100644 --- a/lldb/test/API/functionalities/mtc/swift/TestSwiftMTC.py +++ b/lldb/test/API/functionalities/mtc/swift/TestSwiftMTC.py @@ -13,7 +13,7 @@ class MTCSwiftTestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): diff --git a/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py b/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py index 9794f200ecb6c..0a36dfe29e7cd 100644 --- a/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py +++ b/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py @@ -15,7 +15,7 @@ def setUp(self): self.listener = lldbutil.start_listening_from(self.broadcaster, lldb.SBDebugger.eBroadcastBitProgress) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/functionalities/swift-runtime-reporting/exclusivity-violation/TestExclusivityViolation.py b/lldb/test/API/functionalities/swift-runtime-reporting/exclusivity-violation/TestExclusivityViolation.py index b4ec99f5a4ee9..9f29bca58db38 100644 --- a/lldb/test/API/functionalities/swift-runtime-reporting/exclusivity-violation/TestExclusivityViolation.py +++ b/lldb/test/API/functionalities/swift-runtime-reporting/exclusivity-violation/TestExclusivityViolation.py @@ -25,7 +25,7 @@ class SwiftRuntimeReportingExclusivityViolationTestCase(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) @decorators.swiftTest - @decorators.skipEmbeddedSwift + @decorators.requiresNonEmbeddedSwift @decorators.skipIfLinux @decorators.expectedFailureWindows def test_swift_runtime_reporting(self): diff --git a/lldb/test/API/functionalities/tsan/swift-access-race/TestSwiftTsanAccessRace.py b/lldb/test/API/functionalities/tsan/swift-access-race/TestSwiftTsanAccessRace.py index 0cf398ed9ecf6..b778cd8b455f9 100644 --- a/lldb/test/API/functionalities/tsan/swift-access-race/TestSwiftTsanAccessRace.py +++ b/lldb/test/API/functionalities/tsan/swift-access-race/TestSwiftTsanAccessRace.py @@ -25,7 +25,7 @@ class TsanSwiftAccessRaceTestCase(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIfWindows @skipIfLinux diff --git a/lldb/test/API/functionalities/tsan/swift/TestSwiftTsan.py b/lldb/test/API/functionalities/tsan/swift/TestSwiftTsan.py index 83178a72f6956..9795461d88cb7 100644 --- a/lldb/test/API/functionalities/tsan/swift/TestSwiftTsan.py +++ b/lldb/test/API/functionalities/tsan/swift/TestSwiftTsan.py @@ -24,7 +24,7 @@ class TsanSwiftTestCase(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIfWindows @skipIfLinux diff --git a/lldb/test/API/lang/swift/accelerate_simd/TestAccelerateSIMD.py b/lldb/test/API/lang/swift/accelerate_simd/TestAccelerateSIMD.py index 32b35cbff59b2..003a73de0bdfb 100644 --- a/lldb/test/API/lang/swift/accelerate_simd/TestAccelerateSIMD.py +++ b/lldb/test/API/lang/swift/accelerate_simd/TestAccelerateSIMD.py @@ -1,4 +1,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest]) diff --git a/lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py b/lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py index 383933947ef98..f211bbec26c5f 100644 --- a/lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py +++ b/lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py @@ -44,7 +44,7 @@ def check_variable(self, name, is_reference, contents = 0): self.assertSuccess(error) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): self.build() diff --git a/lldb/test/API/lang/swift/any/TestSwiftAnyType.py b/lldb/test/API/lang/swift/any/TestSwiftAnyType.py index c5577cf520960..303bfaa496e06 100644 --- a/lldb/test/API/lang/swift/any/TestSwiftAnyType.py +++ b/lldb/test/API/lang/swift/any/TestSwiftAnyType.py @@ -23,7 +23,6 @@ class TestSwiftAnyType(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift @swiftTest def test_any_type(self): """Test the Any type""" diff --git a/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py b/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py index b265818761259..81421f5d92686 100644 --- a/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py +++ b/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py @@ -20,7 +20,7 @@ class TestSwiftArchetypeResolution(TestBase): - @skipEmbeddedSwift + @skipEmbeddedSwiftOnLinux # the embedded stdlib's hashing seed needs arc4random_buf, which does not link on Linux. @swiftTest def test_swift_archetype_resolution(self): """Test that archetype-typed objects get resolved to their proper location in memory""" diff --git a/lldb/test/API/lang/swift/archetype_resolution_subclass/TestArchetypeResolutionSubclass.py b/lldb/test/API/lang/swift/archetype_resolution_subclass/TestArchetypeResolutionSubclass.py index 32b35cbff59b2..003a73de0bdfb 100644 --- a/lldb/test/API/lang/swift/archetype_resolution_subclass/TestArchetypeResolutionSubclass.py +++ b/lldb/test/API/lang/swift/archetype_resolution_subclass/TestArchetypeResolutionSubclass.py @@ -1,4 +1,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest]) diff --git a/lldb/test/API/lang/swift/array_bridged_enum/TestArrayBridgedEnum.py b/lldb/test/API/lang/swift/array_bridged_enum/TestArrayBridgedEnum.py index 553b342ea706f..dbdac8957e15f 100644 --- a/lldb/test/API/lang/swift/array_bridged_enum/TestArrayBridgedEnum.py +++ b/lldb/test/API/lang/swift/array_bridged_enum/TestArrayBridgedEnum.py @@ -1,5 +1,5 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, +lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest, skipUnlessFoundation]) diff --git a/lldb/test/API/lang/swift/array_element/TestSwiftArrayElement.py b/lldb/test/API/lang/swift/array_element/TestSwiftArrayElement.py index 32b35cbff59b2..003a73de0bdfb 100644 --- a/lldb/test/API/lang/swift/array_element/TestSwiftArrayElement.py +++ b/lldb/test/API/lang/swift/array_element/TestSwiftArrayElement.py @@ -1,4 +1,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest]) diff --git a/lldb/test/API/lang/swift/array_enum/TestArrayEnum.py b/lldb/test/API/lang/swift/array_enum/TestArrayEnum.py index 32b35cbff59b2..003a73de0bdfb 100644 --- a/lldb/test/API/lang/swift/array_enum/TestArrayEnum.py +++ b/lldb/test/API/lang/swift/array_enum/TestArrayEnum.py @@ -1,4 +1,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest]) diff --git a/lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py b/lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py index 2fc812fc1803d..d13f1724deabc 100644 --- a/lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py +++ b/lldb/test/API/lang/swift/array_tuple_resilient/TestSwiftArrayTupleResilient.py @@ -1,6 +1,6 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, +lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest, skipUnlessDarwin, expectedFailureAll(archs=['arm64_32'], bugnumber="")]) diff --git a/lldb/test/API/lang/swift/array_uninitialized/TestSwiftArrayUninitialized.py b/lldb/test/API/lang/swift/array_uninitialized/TestSwiftArrayUninitialized.py index e45b5415509d5..fb73fd663aacf 100644 --- a/lldb/test/API/lang/swift/array_uninitialized/TestSwiftArrayUninitialized.py +++ b/lldb/test/API/lang/swift/array_uninitialized/TestSwiftArrayUninitialized.py @@ -5,7 +5,7 @@ class TestSwiftArrayUninitialized(lldbtest.TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): """Test unitialized global arrays""" diff --git a/lldb/test/API/lang/swift/artificial_subclass/TestSwiftArtificialSubclass.py b/lldb/test/API/lang/swift/artificial_subclass/TestSwiftArtificialSubclass.py index 32a034e413a37..f81abb537e2f7 100644 --- a/lldb/test/API/lang/swift/artificial_subclass/TestSwiftArtificialSubclass.py +++ b/lldb/test/API/lang/swift/artificial_subclass/TestSwiftArtificialSubclass.py @@ -5,7 +5,7 @@ class TestSwiftArtificialSubclass(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessObjCInterop @swiftTest def test(self): diff --git a/lldb/test/API/lang/swift/associated_self_type/TestSwiftAssociatedSelfType.py b/lldb/test/API/lang/swift/associated_self_type/TestSwiftAssociatedSelfType.py index 7f810c5cd4448..6b5637980f216 100644 --- a/lldb/test/API/lang/swift/associated_self_type/TestSwiftAssociatedSelfType.py +++ b/lldb/test/API/lang/swift/associated_self_type/TestSwiftAssociatedSelfType.py @@ -12,4 +12,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest]) diff --git a/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py b/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py index 2e1163c8f31fa..2b1a41b7f5a0e 100644 --- a/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py +++ b/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py @@ -20,7 +20,7 @@ class TestSwiftArchetypeResolution(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_swift_associated_type_resolution(self): """Test that archetype-typed objects get resolved to their proper location in memory""" diff --git a/lldb/test/API/lang/swift/async/actors/unprioritised_jobs/TestSwiftActorUnprioritisedJobs.py b/lldb/test/API/lang/swift/async/actors/unprioritised_jobs/TestSwiftActorUnprioritisedJobs.py index f76a9f52eb141..24fc35b751331 100644 --- a/lldb/test/API/lang/swift/async/actors/unprioritised_jobs/TestSwiftActorUnprioritisedJobs.py +++ b/lldb/test/API/lang/swift/async/actors/unprioritised_jobs/TestSwiftActorUnprioritisedJobs.py @@ -6,7 +6,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_actor_unprioritised_jobs(self): """Verify that an actor exposes its unprioritised jobs (queue).""" diff --git a/lldb/test/API/lang/swift/async/async_fnargs/TestSwiftAsyncFnArgs.py b/lldb/test/API/lang/swift/async/async_fnargs/TestSwiftAsyncFnArgs.py index d9cbe047edb8a..a5158f93a9c1d 100644 --- a/lldb/test/API/lang/swift/async/async_fnargs/TestSwiftAsyncFnArgs.py +++ b/lldb/test/API/lang/swift/async/async_fnargs/TestSwiftAsyncFnArgs.py @@ -8,7 +8,7 @@ class TestSwiftAsyncFnArgs(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=['windows',]) def test(self): diff --git a/lldb/test/API/lang/swift/async/continuations/TestSwiftContinuationSynthetic.py b/lldb/test/API/lang/swift/async/continuations/TestSwiftContinuationSynthetic.py index 45b1f212cda07..e4d9fd271e721 100644 --- a/lldb/test/API/lang/swift/async/continuations/TestSwiftContinuationSynthetic.py +++ b/lldb/test/API/lang/swift/async/continuations/TestSwiftContinuationSynthetic.py @@ -7,7 +7,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_unsafe_continuation_printing(self): """Print an UnsafeContinuation and verify its children.""" @@ -34,7 +34,7 @@ def test_unsafe_continuation_printing(self): ], ) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_checked_continuation_printing(self): """Print an CheckedContinuation and verify its children.""" diff --git a/lldb/test/API/lang/swift/async/expr/TestSwiftAsyncExpressions.py b/lldb/test/API/lang/swift/async/expr/TestSwiftAsyncExpressions.py index d4dd74c3051d2..86be2e685ca0c 100644 --- a/lldb/test/API/lang/swift/async/expr/TestSwiftAsyncExpressions.py +++ b/lldb/test/API/lang/swift/async/expr/TestSwiftAsyncExpressions.py @@ -8,7 +8,7 @@ class TestSwiftAsyncExpressions(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(archs=no_match(["aarch", "arm64", "arm64e", "arm64_32", "x86_64"])) def test_actor(self): diff --git a/lldb/test/API/lang/swift/async/formatters/task/TestSwiftTaskSyntheticProvider.py b/lldb/test/API/lang/swift/async/formatters/task/TestSwiftTaskSyntheticProvider.py index 68f42b967cfcd..9583231c40f1e 100644 --- a/lldb/test/API/lang/swift/async/formatters/task/TestSwiftTaskSyntheticProvider.py +++ b/lldb/test/API/lang/swift/async/formatters/task/TestSwiftTaskSyntheticProvider.py @@ -7,7 +7,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_top_level_task(self): """Test Task synthetic child provider for top-level Task.""" @@ -34,7 +34,7 @@ def test_top_level_task(self): ], ) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_current_task(self): """Test Task synthetic child for UnsafeCurrentTask (from an async let).""" diff --git a/lldb/test/API/lang/swift/async/formatters/task/children/TestSwiftSyntheticTaskChildren.py b/lldb/test/API/lang/swift/async/formatters/task/children/TestSwiftSyntheticTaskChildren.py index e861828b29c6e..1cdea2ccda48c 100644 --- a/lldb/test/API/lang/swift/async/formatters/task/children/TestSwiftSyntheticTaskChildren.py +++ b/lldb/test/API/lang/swift/async/formatters/task/children/TestSwiftSyntheticTaskChildren.py @@ -7,7 +7,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): diff --git a/lldb/test/API/lang/swift/async/formatters/task/complete/TestSwiftTaskComplete.py b/lldb/test/API/lang/swift/async/formatters/task/complete/TestSwiftTaskComplete.py index 96727a620671a..1d2a32fa596b3 100644 --- a/lldb/test/API/lang/swift/async/formatters/task/complete/TestSwiftTaskComplete.py +++ b/lldb/test/API/lang/swift/async/formatters/task/complete/TestSwiftTaskComplete.py @@ -7,7 +7,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): self.build() diff --git a/lldb/test/API/lang/swift/async/formatters/task/name/TestSwiftTaskName.py b/lldb/test/API/lang/swift/async/formatters/task/name/TestSwiftTaskName.py index 106ce623c5329..e597124e267d3 100644 --- a/lldb/test/API/lang/swift/async/formatters/task/name/TestSwiftTaskName.py +++ b/lldb/test/API/lang/swift/async/formatters/task/name/TestSwiftTaskName.py @@ -7,7 +7,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_summary_contains_name(self): self.build() @@ -16,7 +16,7 @@ def test_summary_contains_name(self): ) self.expect("v task", patterns=[r'"Chore" id:[1-9]']) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIfWindows # rdar://176009590 def test_thread_contains_name(self): diff --git a/lldb/test/API/lang/swift/async/formatters/task/parent/TestSwiftSyntheticTaskParent.py b/lldb/test/API/lang/swift/async/formatters/task/parent/TestSwiftSyntheticTaskParent.py index ac96498e88a0f..fac11e4be9f97 100644 --- a/lldb/test/API/lang/swift/async/formatters/task/parent/TestSwiftSyntheticTaskParent.py +++ b/lldb/test/API/lang/swift/async/formatters/task/parent/TestSwiftSyntheticTaskParent.py @@ -9,7 +9,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): diff --git a/lldb/test/API/lang/swift/async/formatters/task/suspended/TestSwiftTaskSuspended.py b/lldb/test/API/lang/swift/async/formatters/task/suspended/TestSwiftTaskSuspended.py index fd53745d82890..26afb05c31095 100644 --- a/lldb/test/API/lang/swift/async/formatters/task/suspended/TestSwiftTaskSuspended.py +++ b/lldb/test/API/lang/swift/async/formatters/task/suspended/TestSwiftTaskSuspended.py @@ -7,7 +7,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): self.build() diff --git a/lldb/test/API/lang/swift/async/formatters/taskpriority/TestSwiftTaskPrioritySummary.py b/lldb/test/API/lang/swift/async/formatters/taskpriority/TestSwiftTaskPrioritySummary.py index e8a20d7763342..09a8c3ecf5aa5 100644 --- a/lldb/test/API/lang/swift/async/formatters/taskpriority/TestSwiftTaskPrioritySummary.py +++ b/lldb/test/API/lang/swift/async/formatters/taskpriority/TestSwiftTaskPrioritySummary.py @@ -6,7 +6,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): """Test summary formatter for TaskPriority.""" diff --git a/lldb/test/API/lang/swift/async/frame/variable/TestSwiftAsyncFrameVar.py b/lldb/test/API/lang/swift/async/frame/variable/TestSwiftAsyncFrameVar.py index 261fb9e8a4f97..28503ef3205a6 100644 --- a/lldb/test/API/lang/swift/async/frame/variable/TestSwiftAsyncFrameVar.py +++ b/lldb/test/API/lang/swift/async/frame/variable/TestSwiftAsyncFrameVar.py @@ -7,7 +7,7 @@ class TestCase(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=['windows']) def test(self): diff --git a/lldb/test/API/lang/swift/async/frame/variables_multiple_frames/TestSwiftAsyncFrameVarMultipleFrames.py b/lldb/test/API/lang/swift/async/frame/variables_multiple_frames/TestSwiftAsyncFrameVarMultipleFrames.py index 990a7dbbd635f..0b375335f65fb 100644 --- a/lldb/test/API/lang/swift/async/frame/variables_multiple_frames/TestSwiftAsyncFrameVarMultipleFrames.py +++ b/lldb/test/API/lang/swift/async/frame/variables_multiple_frames/TestSwiftAsyncFrameVarMultipleFrames.py @@ -67,7 +67,7 @@ def check_variables(self, async_frames, expected_values): myvar = frame.FindVariable("myvar") lldbutil.check_variable(self, myvar, False, value=expected_value) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows"]) def test(self): diff --git a/lldb/test/API/lang/swift/async/queues/TestSwiftPluginQueues.py b/lldb/test/API/lang/swift/async/queues/TestSwiftPluginQueues.py index 1d07bffcbcf38..b7481bb716c90 100644 --- a/lldb/test/API/lang/swift/async/queues/TestSwiftPluginQueues.py +++ b/lldb/test/API/lang/swift/async/queues/TestSwiftPluginQueues.py @@ -6,7 +6,7 @@ class TestCase(lldbtest.TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows", "linux"]) def test(self): diff --git a/lldb/test/API/lang/swift/async/stepping/step-in/TestSwiftStepInAsync.py b/lldb/test/API/lang/swift/async/stepping/step-in/TestSwiftStepInAsync.py index accaa2aec5d71..4d0749ff38d2b 100644 --- a/lldb/test/API/lang/swift/async/stepping/step-in/TestSwiftStepInAsync.py +++ b/lldb/test/API/lang/swift/async/stepping/step-in/TestSwiftStepInAsync.py @@ -8,7 +8,7 @@ class TestCase(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=['windows']) def test(self): diff --git a/lldb/test/API/lang/swift/async/stepping/step-in/task-switch/TestSwiftTaskSwitch.py b/lldb/test/API/lang/swift/async/stepping/step-in/task-switch/TestSwiftTaskSwitch.py index 01a6b78ae012b..7b1dbcbe16753 100644 --- a/lldb/test/API/lang/swift/async/stepping/step-in/task-switch/TestSwiftTaskSwitch.py +++ b/lldb/test/API/lang/swift/async/stepping/step-in/task-switch/TestSwiftTaskSwitch.py @@ -5,7 +5,7 @@ class TestCase(lldbtest.TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows", "linux"]) @skipIf(macos_version=["<", "26.0"], asan=True) # rdar://138777205 diff --git a/lldb/test/API/lang/swift/async/stepping/step_out/TestSteppingOutAsync.py b/lldb/test/API/lang/swift/async/stepping/step_out/TestSteppingOutAsync.py index fdcb5d941dd2e..532f368ef1662 100644 --- a/lldb/test/API/lang/swift/async/stepping/step_out/TestSteppingOutAsync.py +++ b/lldb/test/API/lang/swift/async/stepping/step_out/TestSteppingOutAsync.py @@ -28,7 +28,7 @@ def step_out_checks(self, thread, expected_func_names): self.assertStopReason(stop_reason, lldb.eStopReasonPlanComplete) self.assertEqual(thread.frames[0].GetFunctionName(), expected_func_name) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows"]) def test(self): diff --git a/lldb/test/API/lang/swift/async/stepping/step_over/TestSwiftAsyncStepOver.py b/lldb/test/API/lang/swift/async/stepping/step_over/TestSwiftAsyncStepOver.py index d442f8c499b3c..2198daeb57560 100644 --- a/lldb/test/API/lang/swift/async/stepping/step_over/TestSwiftAsyncStepOver.py +++ b/lldb/test/API/lang/swift/async/stepping/step_over/TestSwiftAsyncStepOver.py @@ -17,7 +17,7 @@ def check_is_in_line(self, thread, linenum): line_entry = frame.GetLineEntry() self.assertEqual(linenum, line_entry.GetLine()) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows"]) def test(self): @@ -40,7 +40,7 @@ def test(self): self.check_is_in_line(thread, expected_line_num) self.check_x_is_available(thread.frames[0]) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipIfOutOfTreeDebugserver @swiftTest @skipIf(oslist=["windows", "linux"]) diff --git a/lldb/test/API/lang/swift/async/stepping/step_over_asynclet/TestSwiftAsyncStepOverAsyncLet.py b/lldb/test/API/lang/swift/async/stepping/step_over_asynclet/TestSwiftAsyncStepOverAsyncLet.py index 343a1be682c7d..40dc35d188332 100644 --- a/lldb/test/API/lang/swift/async/stepping/step_over_asynclet/TestSwiftAsyncStepOverAsyncLet.py +++ b/lldb/test/API/lang/swift/async/stepping/step_over_asynclet/TestSwiftAsyncStepOverAsyncLet.py @@ -12,7 +12,7 @@ def check_is_in_line(self, thread, linenum): line_entry = frame.GetLineEntry() self.assertEqual(linenum, line_entry.GetLine()) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows"]) def test_nothrow(self): @@ -32,7 +32,7 @@ def test_nothrow(self): self.assertStopReason(stop_reason, lldb.eStopReasonPlanComplete) self.check_is_in_line(thread, expected_line_num) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows"]) def test_throw(self): diff --git a/lldb/test/API/lang/swift/async/taskgroups/TestSwiftTaskGroupSynthetic.py b/lldb/test/API/lang/swift/async/taskgroups/TestSwiftTaskGroupSynthetic.py index bd4cba3356529..d5e585c585ebe 100644 --- a/lldb/test/API/lang/swift/async/taskgroups/TestSwiftTaskGroupSynthetic.py +++ b/lldb/test/API/lang/swift/async/taskgroups/TestSwiftTaskGroupSynthetic.py @@ -7,7 +7,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_print_task_group(self): """Print a TaskGroup and verify its children.""" @@ -17,7 +17,7 @@ def test_print_task_group(self): ) self.do_test_print() - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_print_throwing_task_group(self): """Print a ThrowingTaskGroup and verify its children.""" @@ -61,7 +61,7 @@ def do_test_print(self): ], ) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_api_task_group(self): """Verify a TaskGroup contains its expected children.""" @@ -71,7 +71,7 @@ def test_api_task_group(self): ) self.do_test_api(process) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_api_throwing_task_group(self): """Verify a ThrowingTaskGroup contains its expected children.""" diff --git a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py index a8ab9a0e5e1c7..2b36c5794a1d0 100644 --- a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py +++ b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py @@ -5,7 +5,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_backtrace_task_variable(self): self.build() @@ -14,7 +14,7 @@ def test_backtrace_task_variable(self): ) self.do_backtrace("task") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_backtrace_task_address(self): self.build() diff --git a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py index 5fffa991aee91..f59e40c673167 100644 --- a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py +++ b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py @@ -5,7 +5,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_backtrace_selected_task_variable(self): self.build() @@ -14,7 +14,7 @@ def test_backtrace_selected_task_variable(self): ) self.do_backtrace_selected_task("task") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_backtrace_selected_task_address(self): self.build() @@ -38,7 +38,7 @@ def do_backtrace_selected_task(self, arg): ], ) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_navigate_stack_of_selected_task_variable(self): self.build() @@ -47,7 +47,7 @@ def test_navigate_stack_of_selected_task_variable(self): ) self.do_test_navigate_selected_task_stack(process, "task") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_navigate_stack_of_selected_task_address(self): self.build() diff --git a/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py b/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py index 44ffb24cf0832..ce2f64f52dd92 100644 --- a/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py +++ b/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py @@ -13,7 +13,7 @@ def _tail(output): class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessPlatform(["macosx", "linux"]) @swiftTest def test_compare_printed_task_variable_to_task_info(self): @@ -28,7 +28,7 @@ def test_compare_printed_task_variable_to_task_info(self): task_info_output = self.res.GetOutput() self.assertEqual(_tail(task_info_output), _tail(frame_variable_output)) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessPlatform(["macosx", "linux"]) @swiftTest def test_compare_printed_task_variable_to_task_info_with_address(self): diff --git a/lldb/test/API/lang/swift/async/tasks/list/TestSwiftTaskList.py b/lldb/test/API/lang/swift/async/tasks/list/TestSwiftTaskList.py index d97740bb32daa..32ce219297a5b 100644 --- a/lldb/test/API/lang/swift/async/tasks/list/TestSwiftTaskList.py +++ b/lldb/test/API/lang/swift/async/tasks/list/TestSwiftTaskList.py @@ -5,7 +5,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessPlatform(["macosx", "linux"]) @swiftTest def test_task_list(self): diff --git a/lldb/test/API/lang/swift/async/tasks/tree/TestSwiftTaskTree.py b/lldb/test/API/lang/swift/async/tasks/tree/TestSwiftTaskTree.py index abe0edfb50804..9768927855d6d 100644 --- a/lldb/test/API/lang/swift/async/tasks/tree/TestSwiftTaskTree.py +++ b/lldb/test/API/lang/swift/async/tasks/tree/TestSwiftTaskTree.py @@ -5,7 +5,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessPlatform(["macosx", "linux"]) @swiftTest def test_task_tree(self): diff --git a/lldb/test/API/lang/swift/async/unwind/disable_language_unwinder/TestDisableLanguageUnwinder.py b/lldb/test/API/lang/swift/async/unwind/disable_language_unwinder/TestDisableLanguageUnwinder.py index f2a2a27f1c08b..102c1b884fb8d 100644 --- a/lldb/test/API/lang/swift/async/unwind/disable_language_unwinder/TestDisableLanguageUnwinder.py +++ b/lldb/test/API/lang/swift/async/unwind/disable_language_unwinder/TestDisableLanguageUnwinder.py @@ -5,7 +5,7 @@ class TestDisableLanguageUnwinder(lldbtest.TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=['windows',]) def test(self): diff --git a/lldb/test/API/lang/swift/async/unwind/hidden_frames/TestSwiftAsyncHiddenFrames.py b/lldb/test/API/lang/swift/async/unwind/hidden_frames/TestSwiftAsyncHiddenFrames.py index 0a4d8a6df918a..ae9a97f15cf44 100644 --- a/lldb/test/API/lang/swift/async/unwind/hidden_frames/TestSwiftAsyncHiddenFrames.py +++ b/lldb/test/API/lang/swift/async/unwind/hidden_frames/TestSwiftAsyncHiddenFrames.py @@ -8,7 +8,7 @@ class TestSwiftAsyncHiddenFrames(lldbtest.TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=['windows',]) def test(self): diff --git a/lldb/test/API/lang/swift/async/unwind/sayhello/TestSwiftAsyncUnwind.py b/lldb/test/API/lang/swift/async/unwind/sayhello/TestSwiftAsyncUnwind.py index a0e62bde14a9e..69ff6a5178c79 100644 --- a/lldb/test/API/lang/swift/async/unwind/sayhello/TestSwiftAsyncUnwind.py +++ b/lldb/test/API/lang/swift/async/unwind/sayhello/TestSwiftAsyncUnwind.py @@ -12,7 +12,7 @@ class TestSwiftAsyncUnwind(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=['windows',]) def test(self): diff --git a/lldb/test/API/lang/swift/async/unwind/short_unwind/TestSwiftShortAsyncUnwind.py b/lldb/test/API/lang/swift/async/unwind/short_unwind/TestSwiftShortAsyncUnwind.py index 58d6c74bc2f25..af7d0803fd5e4 100644 --- a/lldb/test/API/lang/swift/async/unwind/short_unwind/TestSwiftShortAsyncUnwind.py +++ b/lldb/test/API/lang/swift/async/unwind/short_unwind/TestSwiftShortAsyncUnwind.py @@ -8,7 +8,7 @@ class TestSwiftAsyncUnwind(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows",]) def test(self): diff --git a/lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/TestSwiftAsyncUnwindAllInstructions.py b/lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/TestSwiftAsyncUnwindAllInstructions.py index e1f8e3f538637..4b9b09f422fdc 100644 --- a/lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/TestSwiftAsyncUnwindAllInstructions.py +++ b/lldb/test/API/lang/swift/async/unwind/unwind_in_all_instructions/TestSwiftAsyncUnwindAllInstructions.py @@ -163,7 +163,7 @@ def find_stopped_thread(self, process, breakpoints): return thread, bpid return None, None - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows"]) def test(self): diff --git a/lldb/test/API/lang/swift/async/unwind/unwind_recursive_q_funclets/TestSwiftAsyncUnwindRecursiveQFunclets.py b/lldb/test/API/lang/swift/async/unwind/unwind_recursive_q_funclets/TestSwiftAsyncUnwindRecursiveQFunclets.py index 2dc8b4676bd4f..0da344acc4a96 100644 --- a/lldb/test/API/lang/swift/async/unwind/unwind_recursive_q_funclets/TestSwiftAsyncUnwindRecursiveQFunclets.py +++ b/lldb/test/API/lang/swift/async/unwind/unwind_recursive_q_funclets/TestSwiftAsyncUnwindRecursiveQFunclets.py @@ -10,7 +10,7 @@ class TestCase(lldbtest.TestBase): unwind_fail_range_cache = dict() - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows",]) @skipIf(archs=["arm64e"]) diff --git a/lldb/test/API/lang/swift/async/unwind/unwind_register_pressure/TestSwiftAsyncUnwindRegisterPressure.py b/lldb/test/API/lang/swift/async/unwind/unwind_register_pressure/TestSwiftAsyncUnwindRegisterPressure.py index a2265225677b9..ab6b2310a45c9 100644 --- a/lldb/test/API/lang/swift/async/unwind/unwind_register_pressure/TestSwiftAsyncUnwindRegisterPressure.py +++ b/lldb/test/API/lang/swift/async/unwind/unwind_register_pressure/TestSwiftAsyncUnwindRegisterPressure.py @@ -60,7 +60,7 @@ def find_stopped_thread(self, process, breakpoints): return thread, bpid return None, None - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=["windows"]) def test(self): diff --git a/lldb/test/API/lang/swift/async/variables/TestSwiftAsyncVariables.py b/lldb/test/API/lang/swift/async/variables/TestSwiftAsyncVariables.py index 57ab240b3e7f2..9c8bcb081696a 100644 --- a/lldb/test/API/lang/swift/async/variables/TestSwiftAsyncVariables.py +++ b/lldb/test/API/lang/swift/async/variables/TestSwiftAsyncVariables.py @@ -8,7 +8,7 @@ class TestSwiftAsyncVariables(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(oslist=['windows']) def test(self): diff --git a/lldb/test/API/lang/swift/async_breakpoints/TestSwiftAsyncBreakpoints.py b/lldb/test/API/lang/swift/async_breakpoints/TestSwiftAsyncBreakpoints.py index 477f84c53416b..6114c06b3f9ba 100644 --- a/lldb/test/API/lang/swift/async_breakpoints/TestSwiftAsyncBreakpoints.py +++ b/lldb/test/API/lang/swift/async_breakpoints/TestSwiftAsyncBreakpoints.py @@ -5,7 +5,7 @@ class TestSwiftAsyncBreakpoints(lldbtest.TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIfWindows @skipIfLinux diff --git a/lldb/test/API/lang/swift/async_breakpoints_over_many_funclets/TestSwiftAsyncBreakpointsOverManyFunclets.py b/lldb/test/API/lang/swift/async_breakpoints_over_many_funclets/TestSwiftAsyncBreakpointsOverManyFunclets.py index 7ac2e15287cce..5b9ba246ba814 100644 --- a/lldb/test/API/lang/swift/async_breakpoints_over_many_funclets/TestSwiftAsyncBreakpointsOverManyFunclets.py +++ b/lldb/test/API/lang/swift/async_breakpoints_over_many_funclets/TestSwiftAsyncBreakpointsOverManyFunclets.py @@ -5,7 +5,7 @@ class TestSwiftAsyncBreakpoints(lldbtest.TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @expectedFailureWindows @skipIfLinux diff --git a/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py b/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py index 526eda1f1a1dd..ef489142fb844 100644 --- a/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py +++ b/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py @@ -34,7 +34,7 @@ def setUp(self): # Call super's setUp(). TestBase.setUp(self) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # embedded Swift strips functions the program never calls, so f() is not in the binary to call @swiftTest @skipIf(oslist=['linux', 'windows']) def testAvailability(self): diff --git a/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py b/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py index f88b1c8206ddd..d7ceb524f056e 100644 --- a/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py +++ b/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py @@ -9,7 +9,7 @@ class TestSwiftBridgedMetatype(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipUnlessFoundation def test_swift_bridged_metatype(self): diff --git a/lldb/test/API/lang/swift/bridged_url/TestSwiftBridgedURL.py b/lldb/test/API/lang/swift/bridged_url/TestSwiftBridgedURL.py index 52981d2c0fea9..11a3c806dfb94 100644 --- a/lldb/test/API/lang/swift/bridged_url/TestSwiftBridgedURL.py +++ b/lldb/test/API/lang/swift/bridged_url/TestSwiftBridgedURL.py @@ -5,7 +5,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessFoundationEssentials @skipIfLinux # https://github.com/swiftlang/llvm-project/issues/13465 @swiftTest diff --git a/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py b/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py index 4452fe846e856..4648c2e67fc7d 100644 --- a/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py +++ b/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py @@ -5,7 +5,6 @@ class TestSwiftCCompatEnum(TestBase): - @skipEmbeddedSwift @swiftTest def test(self): self.build() diff --git a/lldb/test/API/lang/swift/cf/uuid/TestCFUUID.py b/lldb/test/API/lang/swift/cf/uuid/TestCFUUID.py index 169c4bcc70f2a..62ec74dff1028 100644 --- a/lldb/test/API/lang/swift/cf/uuid/TestCFUUID.py +++ b/lldb/test/API/lang/swift/cf/uuid/TestCFUUID.py @@ -9,7 +9,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipUnlessFoundation def test(self): diff --git a/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py b/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py index c3129050239a5..5d703649c908b 100644 --- a/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py +++ b/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py @@ -21,7 +21,7 @@ class TestSwiftBridgingHeaderHeadermap(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/caching/TestSwiftClangImporterCaching.py b/lldb/test/API/lang/swift/clangimporter/caching/TestSwiftClangImporterCaching.py index 0cd41541f35c0..5afa785bcca9c 100644 --- a/lldb/test/API/lang/swift/clangimporter/caching/TestSwiftClangImporterCaching.py +++ b/lldb/test/API/lang/swift/clangimporter/caching/TestSwiftClangImporterCaching.py @@ -5,7 +5,6 @@ class TestSwiftClangImporterCaching(TestBase): - @skipEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(swift_module_importer="noclang") @skipIf(setting=("symbols.swift-precise-compiler-invocation", "false")) diff --git a/lldb/test/API/lang/swift/clangimporter/class_nsbaseclass/TestSwiftNSClassBaseClass.py b/lldb/test/API/lang/swift/clangimporter/class_nsbaseclass/TestSwiftNSClassBaseClass.py index 1cda2b8cd46c4..6f7026f7dfa9e 100644 --- a/lldb/test/API/lang/swift/clangimporter/class_nsbaseclass/TestSwiftNSClassBaseClass.py +++ b/lldb/test/API/lang/swift/clangimporter/class_nsbaseclass/TestSwiftNSClassBaseClass.py @@ -6,7 +6,7 @@ class TestSwiftNSClassBaseClass(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipUnlessDarwin def test(self): diff --git a/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py b/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py index aad8ee2bb73b2..6b171478b5560 100644 --- a/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py +++ b/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py @@ -17,7 +17,7 @@ import os class TestSwiftDedupMacros(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) # NOTE: rdar://44201206 - This test may sporadically segfault. It's likely diff --git a/lldb/test/API/lang/swift/clangimporter/custom_alignment/TestSwiftClangImporterCustomAlignment.py b/lldb/test/API/lang/swift/clangimporter/custom_alignment/TestSwiftClangImporterCustomAlignment.py index a09c72d77ac18..612b234f96b58 100644 --- a/lldb/test/API/lang/swift/clangimporter/custom_alignment/TestSwiftClangImporterCustomAlignment.py +++ b/lldb/test/API/lang/swift/clangimporter/custom_alignment/TestSwiftClangImporterCustomAlignment.py @@ -20,7 +20,7 @@ class TestSwiftClangImporterCustomAlignment(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) def test(self): diff --git a/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py b/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py index 41b06d3543b7b..1edadf831ff51 100644 --- a/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py +++ b/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py @@ -18,7 +18,7 @@ import shutil class TestSwiftDynamicTypeResolutionImportConflict(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/TestSwiftClangImporterExplicitNoImplicit.py b/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/TestSwiftClangImporterExplicitNoImplicit.py index 6691fd83b404f..ded80cd7c749f 100644 --- a/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/TestSwiftClangImporterExplicitNoImplicit.py +++ b/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/TestSwiftClangImporterExplicitNoImplicit.py @@ -7,7 +7,7 @@ class TestSwiftClangImporterExplicitNoImplicit(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/extra_inhabitants/TestSwiftClangImporterExtraInhabitants.py b/lldb/test/API/lang/swift/clangimporter/extra_inhabitants/TestSwiftClangImporterExtraInhabitants.py index c7cc365d0f853..95e37ce97148c 100644 --- a/lldb/test/API/lang/swift/clangimporter/extra_inhabitants/TestSwiftClangImporterExtraInhabitants.py +++ b/lldb/test/API/lang/swift/clangimporter/extra_inhabitants/TestSwiftClangImporterExtraInhabitants.py @@ -4,7 +4,7 @@ import lldbsuite.test.lldbutil as lldbutil class TestSwiftClangImporterExtraInhabitants(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipUnlessDarwin # Don't run ClangImporter tests if Clangimporter is disabled. diff --git a/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/TestSwiftHardMacroConflict.py b/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/TestSwiftHardMacroConflict.py index d0a69c932d10c..a1601890cfddb 100644 --- a/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/TestSwiftHardMacroConflict.py +++ b/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/TestSwiftHardMacroConflict.py @@ -9,7 +9,7 @@ class TestSwiftHardMacroConflict(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py b/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py index dc84696e8addc..d901887cd17fc 100644 --- a/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py +++ b/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py @@ -22,7 +22,7 @@ class TestSwiftHeadermapConflict(TestBase): bugnumber="rdar://60396797", setting=("symbols.use-swift-clangimporter", "false"), ) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): # To ensure we hit the rebuild problem remove the cache to avoid caching. diff --git a/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py b/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py index bb8ce4313b141..f7a1f3729502d 100644 --- a/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py +++ b/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py @@ -18,7 +18,7 @@ import shutil class TestSwiftIncludeConflict(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @swiftTest diff --git a/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py b/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py index 8098885156c74..f0c62b0c3e555 100644 --- a/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py +++ b/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py @@ -11,7 +11,7 @@ class TestSwiftMissingVFSOverlay(TestBase): def setUp(self): TestBase.setUp(self) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=("symbols.use-swift-clangimporter", "false")) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/nserror/TestNSError.py b/lldb/test/API/lang/swift/clangimporter/nserror/TestNSError.py index 56ac7585e069e..dc7569cfb3bb4 100644 --- a/lldb/test/API/lang/swift/clangimporter/nserror/TestNSError.py +++ b/lldb/test/API/lang/swift/clangimporter/nserror/TestNSError.py @@ -19,7 +19,7 @@ class SwiftNSErrorTest(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test_swift_nserror(self): diff --git a/lldb/test/API/lang/swift/clangimporter/nsinteger_nsenum/TestSwiftNSIntegerNSEnum.py b/lldb/test/API/lang/swift/clangimporter/nsinteger_nsenum/TestSwiftNSIntegerNSEnum.py index ada3eb86ee49a..b8f60a8a763f3 100644 --- a/lldb/test/API/lang/swift/clangimporter/nsinteger_nsenum/TestSwiftNSIntegerNSEnum.py +++ b/lldb/test/API/lang/swift/clangimporter/nsinteger_nsenum/TestSwiftNSIntegerNSEnum.py @@ -21,14 +21,14 @@ def check(var, output): check(frame.FindVariable('e1'), 'eCase1') check(frame.FindVariable('e2'), 'eCase2') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test_reflection(self): self.expect("setting set symbols.swift-enable-ast-context false") self.do_test(use_summary=True) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run a clangimporter test without ClangImporter. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/objc/dynamic-swift-type/TestSwiftObjCDynamicType.py b/lldb/test/API/lang/swift/clangimporter/objc/dynamic-swift-type/TestSwiftObjCDynamicType.py index caa1601d62307..67307d521e954 100644 --- a/lldb/test/API/lang/swift/clangimporter/objc/dynamic-swift-type/TestSwiftObjCDynamicType.py +++ b/lldb/test/API/lang/swift/clangimporter/objc/dynamic-swift-type/TestSwiftObjCDynamicType.py @@ -5,7 +5,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessFoundation @swiftTest def test(self): diff --git a/lldb/test/API/lang/swift/clangimporter/objc_baseclass/TestSwiftObjCBaseClassMemberLookup.py b/lldb/test/API/lang/swift/clangimporter/objc_baseclass/TestSwiftObjCBaseClassMemberLookup.py index 585d2c19d0dfd..80c11641f0a11 100644 --- a/lldb/test/API/lang/swift/clangimporter/objc_baseclass/TestSwiftObjCBaseClassMemberLookup.py +++ b/lldb/test/API/lang/swift/clangimporter/objc_baseclass/TestSwiftObjCBaseClassMemberLookup.py @@ -5,7 +5,7 @@ class TestSwiftObjCBaseClassMemberLookup(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): diff --git a/lldb/test/API/lang/swift/clangimporter/objc_inherited_ivars/TestSwiftAtObjCIvars.py b/lldb/test/API/lang/swift/clangimporter/objc_inherited_ivars/TestSwiftAtObjCIvars.py index 1db5a85c9fb13..b79a5ff5018f6 100644 --- a/lldb/test/API/lang/swift/clangimporter/objc_inherited_ivars/TestSwiftAtObjCIvars.py +++ b/lldb/test/API/lang/swift/clangimporter/objc_inherited_ivars/TestSwiftAtObjCIvars.py @@ -26,7 +26,7 @@ def check_foo(self, theFoo): lldbutil.check_variable(self, x, False, value='12') lldbutil.check_variable(self, y, False, '"12"') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test_swift_at_objc_ivars(self): diff --git a/lldb/test/API/lang/swift/clangimporter/objc_internal_property_redecl/TestObjCInternalPropertyRedecl.py b/lldb/test/API/lang/swift/clangimporter/objc_internal_property_redecl/TestObjCInternalPropertyRedecl.py index d02731007534e..c9986e468c68c 100644 --- a/lldb/test/API/lang/swift/clangimporter/objc_internal_property_redecl/TestObjCInternalPropertyRedecl.py +++ b/lldb/test/API/lang/swift/clangimporter/objc_internal_property_redecl/TestObjCInternalPropertyRedecl.py @@ -8,7 +8,7 @@ class TestObjCInternalPropertyRedecl(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) diff --git a/lldb/test/API/lang/swift/clangimporter/objc_optional_dict/TestSwiftObjCOptionalDict.py b/lldb/test/API/lang/swift/clangimporter/objc_optional_dict/TestSwiftObjCOptionalDict.py index 0a7e896aed26f..bda8dccd63571 100644 --- a/lldb/test/API/lang/swift/clangimporter/objc_optional_dict/TestSwiftObjCOptionalDict.py +++ b/lldb/test/API/lang/swift/clangimporter/objc_optional_dict/TestSwiftObjCOptionalDict.py @@ -4,7 +4,7 @@ import lldbsuite.test.lldbutil as lldbutil class TestSwiftObjCOptionalDict(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): diff --git a/lldb/test/API/lang/swift/clangimporter/objc_protocol/TestSwiftObjCProtocol.py b/lldb/test/API/lang/swift/clangimporter/objc_protocol/TestSwiftObjCProtocol.py index c862b1dac61fe..6bfe94a8273b5 100644 --- a/lldb/test/API/lang/swift/clangimporter/objc_protocol/TestSwiftObjCProtocol.py +++ b/lldb/test/API/lang/swift/clangimporter/objc_protocol/TestSwiftObjCProtocol.py @@ -4,7 +4,7 @@ import lldbsuite.test.lldbutil as lldbutil class TestSwiftObjCProtocol(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): diff --git a/lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/TestSwiftObjCProtocolFields.py b/lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/TestSwiftObjCProtocolFields.py index c0a368ca13c5b..bf74030b334fe 100644 --- a/lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/TestSwiftObjCProtocolFields.py +++ b/lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/TestSwiftObjCProtocolFields.py @@ -5,7 +5,7 @@ class TestSwiftObjCBaseClassMemberLookup(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): diff --git a/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/TestObjCIvarDiscovery.py b/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/TestObjCIvarDiscovery.py index b384c0233e282..1bf726a29a171 100644 --- a/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/TestObjCIvarDiscovery.py +++ b/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/TestObjCIvarDiscovery.py @@ -22,7 +22,7 @@ import shutil class TestObjCIVarDiscovery(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @skipIf(debug_info=no_match("dsym")) @swiftTest @@ -31,7 +31,7 @@ def test_nodbg(self): shutil.rmtree(self.getBuildArtifact("aTestFramework.framework/Versions/A/aTestFramework.dSYM")) self.do_test(False) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @skipIf(debug_info=no_match("dsym")) @swiftTest diff --git a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py index 4da686bdec221..03ac8a8068a76 100644 --- a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py +++ b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py @@ -18,7 +18,7 @@ import shutil class TestSwiftObjCMainConflictingDylibsBridgingHeader(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py index c60342860f9bc..8cd52e7a0b8df 100644 --- a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py +++ b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py @@ -21,7 +21,7 @@ class TestSwiftObjCMainConflictingDylibsFailingImport(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/override_options/TestSwiftClangOverrideOptions.py b/lldb/test/API/lang/swift/clangimporter/override_options/TestSwiftClangOverrideOptions.py index 0a0ae7e5b4710..acad756e415e7 100644 --- a/lldb/test/API/lang/swift/clangimporter/override_options/TestSwiftClangOverrideOptions.py +++ b/lldb/test/API/lang/swift/clangimporter/override_options/TestSwiftClangOverrideOptions.py @@ -5,7 +5,7 @@ class TestCase(lldbtest.TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessFoundationEssentials @skipIfLinux # https://github.com/swiftlang/llvm-project/issues/13465 @swiftTest diff --git a/lldb/test/API/lang/swift/clangimporter/protocol_composition/TestSwiftClangImporterProtocolComposition.py b/lldb/test/API/lang/swift/clangimporter/protocol_composition/TestSwiftClangImporterProtocolComposition.py index c7008dbfcd6fa..449fe48d46f5e 100644 --- a/lldb/test/API/lang/swift/clangimporter/protocol_composition/TestSwiftClangImporterProtocolComposition.py +++ b/lldb/test/API/lang/swift/clangimporter/protocol_composition/TestSwiftClangImporterProtocolComposition.py @@ -4,7 +4,7 @@ import lldbsuite.test.lldbutil as lldbutil class TestSwiftClangImporterProtocolComposition(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): diff --git a/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py b/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py index 67db8af5c6553..d7f28f951632f 100644 --- a/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py +++ b/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py @@ -17,7 +17,7 @@ import os class TestSwiftRemoteASTImport(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py b/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py index 2d140f1c9793d..1a869f32ffa58 100644 --- a/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py +++ b/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py @@ -18,7 +18,7 @@ import shutil class TestSwiftRewriteClangPaths(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin @@ -27,7 +27,7 @@ class TestSwiftRewriteClangPaths(TestBase): def testWithRemap(self): self.dotest(True) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py b/lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py index 175395b7c0c96..91c9f52bfbaee 100644 --- a/lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py +++ b/lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py @@ -17,7 +17,7 @@ import os class TestSwiftStaticArchiveTwoSwiftmodules(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # Don't run ClangImporter tests if Clangimporter is disabled. @skipIf(setting=('symbols.use-swift-clangimporter', 'false')) @skipUnlessDarwin diff --git a/lldb/test/API/lang/swift/clangimporter/submodules/TestSwiftSubmoduleImport.py b/lldb/test/API/lang/swift/clangimporter/submodules/TestSwiftSubmoduleImport.py index 369dde5404ad0..fb76335dbe0c7 100644 --- a/lldb/test/API/lang/swift/clangimporter/submodules/TestSwiftSubmoduleImport.py +++ b/lldb/test/API/lang/swift/clangimporter/submodules/TestSwiftSubmoduleImport.py @@ -4,7 +4,7 @@ import lldbsuite.test.lldbutil as lldbutil class TestSwiftSubmoduleImport(lldbtest.TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): """Test imports of Clang submodules""" diff --git a/lldb/test/API/lang/swift/clashing_abi_name/TestSwiftClashingABIName.py b/lldb/test/API/lang/swift/clashing_abi_name/TestSwiftClashingABIName.py index 1714effb75cba..3d0c6ed39e2be 100644 --- a/lldb/test/API/lang/swift/clashing_abi_name/TestSwiftClashingABIName.py +++ b/lldb/test/API/lang/swift/clashing_abi_name/TestSwiftClashingABIName.py @@ -4,7 +4,7 @@ import lldbsuite.test.lldbutil as lldbutil class TestSwiftClashingABIName(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): """Test that expressions with types in modules with clashing abi names works""" @@ -22,7 +22,7 @@ def test(self): self.expect('expr --bind-generic-types true -- generic3', substrs=['a.Generic2>', 't2 =', 't =', 'j = 98']) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_in_self(self): """Test a library with a private import for which there is no debug info""" diff --git a/lldb/test/API/lang/swift/class_error/TestClassError.py b/lldb/test/API/lang/swift/class_error/TestClassError.py index cc1c0f573b50c..219ec22975294 100644 --- a/lldb/test/API/lang/swift/class_error/TestClassError.py +++ b/lldb/test/API/lang/swift/class_error/TestClassError.py @@ -12,4 +12,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest]) diff --git a/lldb/test/API/lang/swift/closure_shortcuts/TestClosureShortcuts.py b/lldb/test/API/lang/swift/closure_shortcuts/TestClosureShortcuts.py index 577baecfadd6f..5fcd084bec07d 100644 --- a/lldb/test/API/lang/swift/closure_shortcuts/TestClosureShortcuts.py +++ b/lldb/test/API/lang/swift/closure_shortcuts/TestClosureShortcuts.py @@ -15,7 +15,7 @@ class TestClosureShortcuts(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): self.build() diff --git a/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py b/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py index ef96c219bd734..c28bc07b8f8f0 100644 --- a/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py +++ b/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py @@ -51,7 +51,7 @@ def get_to_bkpt(self, bkpt_name): target.BreakpointDelete(bkpt.GetID()) return (target, process, thread) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_simple_closure(self): self.build() @@ -60,7 +60,7 @@ def test_simple_closure(self): check_not_captured_error(self, thread.frames[0], "arg", "func_1(arg:)") check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_nested_closure(self): self.build() @@ -85,7 +85,7 @@ def test_nested_closure(self): ) check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest # Async variable inspection on Linux/Windows are still problematic. @skipIf(oslist=["windows", "linux"]) @@ -109,7 +109,7 @@ def test_async_closure(self): ) check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest # Async variable inspection on Linux/Windows are still problematic. @skipIf(oslist=["windows", "linux"]) @@ -122,7 +122,7 @@ def test_task_inside_non_async_func(self): self, thread.frames[0], "x", "task_inside_non_async_function()" ) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_ctor_class_closure(self): self.build() @@ -180,7 +180,7 @@ def test_ctor_class_closure(self): ) check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_ctor_struct_closure(self): self.build() @@ -238,7 +238,7 @@ def test_ctor_struct_closure(self): ) check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_ctor_enum_closure(self): self.build() diff --git a/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py b/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py index 55ff080577340..7c1955256a6a2 100644 --- a/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py +++ b/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py @@ -18,7 +18,7 @@ def memory_find(self, name: str, expr: str, target): self.expect(f'memory find -e "{expr}" {hex(addr)} {hex(addr + 8)}', substrs=["data found at location"]) - @skipEmbeddedSwift + @skipEmbeddedSwiftOnLinux # `memory find -e` does not locate the value in embedded Swift on Linux. @swiftTest def test(self): self.build() diff --git a/lldb/test/API/lang/swift/command_memory_read/TestSwiftMemoryRead.py b/lldb/test/API/lang/swift/command_memory_read/TestSwiftMemoryRead.py index 86164680f644f..75ffd83ea353b 100644 --- a/lldb/test/API/lang/swift/command_memory_read/TestSwiftMemoryRead.py +++ b/lldb/test/API/lang/swift/command_memory_read/TestSwiftMemoryRead.py @@ -5,7 +5,7 @@ class TestCase(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_scalar_types(self): self.build() diff --git a/lldb/test/API/lang/swift/constrained_existential_metatype/TestSwiftConstrainedExistentialMetatypeFix.py b/lldb/test/API/lang/swift/constrained_existential_metatype/TestSwiftConstrainedExistentialMetatypeFix.py index 6cc0b2e1fa344..0a0b2b3bda1be 100644 --- a/lldb/test/API/lang/swift/constrained_existential_metatype/TestSwiftConstrainedExistentialMetatypeFix.py +++ b/lldb/test/API/lang/swift/constrained_existential_metatype/TestSwiftConstrainedExistentialMetatypeFix.py @@ -6,7 +6,7 @@ class TestSwiftConstrainedExistentialMetatypeFix(TestBase): @swiftTest - @skipEmbeddedSwift + @requiresNonEmbeddedSwift def test(self): self.build() diff --git a/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py b/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py index 3b04755508d35..df8601a4c63c2 100644 --- a/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py +++ b/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py @@ -6,7 +6,6 @@ class TestSwiftConventionCFunctionPointer(TestBase): @swiftTest - @skipEmbeddedSwift def test(self): self.build() self.runCmd("settings set symbols.swift-enable-ast-context false") diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/expressions/TestSwiftBackwardInteropExpressions.py b/lldb/test/API/lang/swift/cxx_interop/backward/expressions/TestSwiftBackwardInteropExpressions.py index 22b24c69c531e..0a4229624c9ed 100644 --- a/lldb/test/API/lang/swift/cxx_interop/backward/expressions/TestSwiftBackwardInteropExpressions.py +++ b/lldb/test/API/lang/swift/cxx_interop/backward/expressions/TestSwiftBackwardInteropExpressions.py @@ -7,7 +7,7 @@ class TestSwiftBackwardInteropExpressions(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_func_step_in(self): self.build() diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part01.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part01.py index 21ee2e5295f9b..6a9fd95af8200 100644 --- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part01.py +++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part01.py @@ -32,25 +32,25 @@ def check_step_over(self, thread, func): name = thread.frames[0].GetFunctionName() self.assertIn(func, name) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_method_step_in_class(self): thread = self.setup('Break here for method - class') self.check_step_in(thread, 'testMethod', 'SwiftClass.swiftMethod') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_method_step_over_class(self): thread = self.setup('Break here for method - class') self.check_step_over(thread, 'testMethod') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_init_step_in_class(self): thread = self.setup('Break here for constructor - class') self.check_step_in(thread, 'testConstructor', 'SwiftClass.init') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_init_step_over_class(self): thread = self.setup('Break here for constructor - class') diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part02.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part02.py index 0223e53913532..908f10b8650a7 100644 --- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part02.py +++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part02.py @@ -32,25 +32,25 @@ def check_step_over(self, thread, func): name = thread.frames[0].GetFunctionName() self.assertIn(func, name) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_static_method_step_in_class(self): thread = self.setup('Break here for static method - class') self.check_step_in(thread, 'testStaticMethod', 'SwiftClass.swiftStaticMethod') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_static_method_step_over_class(self): thread = self.setup('Break here for static method - class') self.check_step_over(thread, 'testStaticMethod') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_getter_step_in_class(self): thread = self.setup('Break here for getter - class') self.check_step_in(thread, 'testGetter', 'SwiftClass.swiftProperty.getter') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_getter_step_over_class(self): thread = self.setup('Break here for getter - class') diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part03.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part03.py index ce85122337992..3965ac1d68fad 100644 --- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part03.py +++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingClass_part03.py @@ -32,26 +32,26 @@ def check_step_over(self, thread, func): name = thread.frames[0].GetFunctionName() self.assertIn(func, name) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_setter_step_in_class(self): thread = self.setup('Break here for setter - class') self.check_step_in(thread, 'testSetter', 'SwiftClass.swiftProperty.setter') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_setter_step_over_class(self): thread = self.setup('Break here for setter - class') self.check_step_over(thread, 'testSetter') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_overriden_step_in_class(self): thread = self.setup('Break here for overridden - class') self.check_step_in(thread, 'testOverridenMethod', 'SwiftSubclass.overrideableMethod') - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_overriden_step_over_class(self): thread = self.setup('Break here for overridden') diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingFunc.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingFunc.py index 6ea8cb32d47d7..4de244804eeec 100644 --- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingFunc.py +++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingFunc.py @@ -33,13 +33,13 @@ def check_step_over(self, thread, func): name = thread.frames[0].GetFunctionName() self.assertIn(func, name) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_func_step_in(self): thread = self.setup("Break here for func") self.check_step_in(thread, "testFunc", "swiftFunc") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_func_step_over(self): thread = self.setup("Break here for func") diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part01.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part01.py index 3cb9191aceb43..0d5d8540e022a 100644 --- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part01.py +++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part01.py @@ -33,25 +33,25 @@ def check_step_over(self, thread, func): name = thread.frames[0].GetFunctionName() self.assertIn(func, name) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_method_step_in_struct(self): thread = self.setup("Break here for method - struct") self.check_step_in(thread, "testMethod", "SwiftStruct.swiftMethod") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_method_step_over_struct(self): thread = self.setup("Break here for method - struct") self.check_step_over(thread, "testMethod") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_init_step_in_struct(self): thread = self.setup("Break here for constructor - struct") self.check_step_in(thread, "testConstructor", "SwiftStruct.init") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_init_step_over_struct(self): thread = self.setup("Break here for constructor - struct") diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part02.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part02.py index 290d03f1ff08d..9d5a2e192dea1 100644 --- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part02.py +++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part02.py @@ -33,25 +33,25 @@ def check_step_over(self, thread, func): name = thread.frames[0].GetFunctionName() self.assertIn(func, name) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_static_method_step_in_struct(self): thread = self.setup("Break here for static method - struct") self.check_step_in(thread, "testStaticMethod", "SwiftStruct.swiftStaticMethod") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_static_method_step_over_struct(self): thread = self.setup("Break here for static method - struct") self.check_step_over(thread, "testStaticMethod") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_getter_step_in_struct(self): thread = self.setup("Break here for getter - struct") self.check_step_in(thread, "testGetter", "SwiftStruct.swiftProperty.getter") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_getter_step_over_struct(self): thread = self.setup("Break here for getter - struct") diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part03.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part03.py index d06170b84c4a6..3b690ef82cd22 100644 --- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part03.py +++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropSteppingStruct_part03.py @@ -33,13 +33,13 @@ def check_step_over(self, thread, func): name = thread.frames[0].GetFunctionName() self.assertIn(func, name) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_setter_step_in_struct(self): thread = self.setup("Break here for setter - struct") self.check_step_in(thread, "testSetter", "SwiftStruct.swiftProperty.setter") - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_setter_step_over_struct(self): thread = self.setup("Break here for setter - struct") diff --git a/lldb/test/API/lang/swift/cxx_interop/forward/cxx-class/TestSwiftForwardInteropCxxClass.py b/lldb/test/API/lang/swift/cxx_interop/forward/cxx-class/TestSwiftForwardInteropCxxClass.py index 6c1f4d56bed28..cfd69567268a6 100644 --- a/lldb/test/API/lang/swift/cxx_interop/forward/cxx-class/TestSwiftForwardInteropCxxClass.py +++ b/lldb/test/API/lang/swift/cxx_interop/forward/cxx-class/TestSwiftForwardInteropCxxClass.py @@ -8,7 +8,7 @@ class TestSwiftForwardInteropCxxClass(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_class(self): self.build() diff --git a/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py b/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py index a0bf11d496b73..ab4da451a6189 100644 --- a/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py +++ b/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py @@ -12,7 +12,7 @@ class TestSwiftForwardInteropSTLTypes(TestBase): @skipIf( setting=("symbols.use-swift-clangimporter", "false") ) # rdar://106438227 (TestSTLTypes fails when clang importer is disabled) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIfWindows def test(self): diff --git a/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py b/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py index 99b71b91c8757..71c58bf2b5b0f 100644 --- a/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py +++ b/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py @@ -22,7 +22,7 @@ class TestSwiftDeploymentTarget(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @skipIfDarwinEmbedded # This test uses macOS triples explicitly. @skipIf(macos_version=["<", "11.1"]) @@ -34,7 +34,7 @@ def test_swift_deployment_target(self): lldb.SBFileSpec('main.swift')) self.expect("expression f", substrs=['i = 23']) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @skipIfDarwinEmbedded # This test uses macOS triples explicitly. @skipIf(macos_version=["<", "11.1"]) @@ -48,7 +48,7 @@ def test_swift_deployment_target_dlopen(self): lldbutil.continue_to_breakpoint(process, bkpt) self.expect("expression self", substrs=['i = 23']) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @skipIfDarwinEmbedded # This test uses macOS triples explicitly. @skipIf(macos_version=["<", "11.1"]) @@ -69,7 +69,7 @@ def test_swift_deployment_target_from_macho(self): # CHECK: SwiftASTContextForExpressions(module: "a", cu: "main.swift")::SetTriple({{.*}}apple-macosx11.0.0 # CHECK-NOT: SwiftASTContextForExpressions(module: "a", cu: "main.swift")::RegisterSectionModules("a.out"){{.*}} AST Data blobs - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin # This test uses macOS triples explicitly. @skipIfDarwinEmbedded @skipIf(macos_version=["<", "11.1"]) diff --git a/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py b/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py index 41744b1c6a522..d6aea8934baf1 100644 --- a/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py +++ b/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py @@ -30,7 +30,7 @@ def run_tests(self, target, process): # FIXME: this is formatted incorrectly. self.expect("fr var -d no-dynamic t", substrs=["(T)"]) #, "world"]) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # embedded Swift monomorphizes every generic, so the parameter is never typed (T) @swiftTest @skipIf(debug_info=no_match(["dwarf"])) def test_missing_module(self): @@ -39,7 +39,7 @@ def test_missing_module(self): target, process, _, _ = lldbutil.run_to_name_breakpoint(self, 'main') self.run_tests(target, process) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # embedded Swift monomorphizes every generic, so the parameter is never typed (T) @swiftTest @skipIf(debug_info=no_match(["dwarf"])) def test_damaged_module(self): diff --git a/lldb/test/API/lang/swift/different_abi_name/TestSwiftDifferentABIName.py b/lldb/test/API/lang/swift/different_abi_name/TestSwiftDifferentABIName.py index e6298c0187f54..f919e311dab5e 100644 --- a/lldb/test/API/lang/swift/different_abi_name/TestSwiftDifferentABIName.py +++ b/lldb/test/API/lang/swift/different_abi_name/TestSwiftDifferentABIName.py @@ -5,7 +5,7 @@ class TestSwiftDifferentABIName(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test(self): self.build() diff --git a/lldb/test/API/lang/swift/dwarfimporter/Objective-C/TestSwiftDWARFImporterObjC.py b/lldb/test/API/lang/swift/dwarfimporter/Objective-C/TestSwiftDWARFImporterObjC.py index 0a9efcb2a99c4..d30230b37594c 100644 --- a/lldb/test/API/lang/swift/dwarfimporter/Objective-C/TestSwiftDWARFImporterObjC.py +++ b/lldb/test/API/lang/swift/dwarfimporter/Objective-C/TestSwiftDWARFImporterObjC.py @@ -34,7 +34,7 @@ def build(self): self.assertTrue(os.path.isdir(include)) shutil.rmtree(include) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test(self): @@ -61,7 +61,7 @@ def test(self): #self.expect("target var -d run proto", substrs=["(ProtoImpl)", "proto"]) #self.expect("target var -O proto", substrs=[" @swiftTest def test_swift_generic_enum_types(self): """Test that we handle reasonably generically-typed enums""" diff --git a/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_array/TestSwiftGenericStructDebugInfoGenericArray.py b/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_array/TestSwiftGenericStructDebugInfoGenericArray.py index ab7978469873a..3eba995b0f52c 100644 --- a/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_array/TestSwiftGenericStructDebugInfoGenericArray.py +++ b/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_array/TestSwiftGenericStructDebugInfoGenericArray.py @@ -12,4 +12,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest]) diff --git a/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_flatmap/TestSwiftGenericStructDebugInfoGenericFlatMap.py b/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_flatmap/TestSwiftGenericStructDebugInfoGenericFlatMap.py index 18087b7500cb3..7097719428148 100644 --- a/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_flatmap/TestSwiftGenericStructDebugInfoGenericFlatMap.py +++ b/lldb/test/API/lang/swift/variables/generic_struct_debug_info/generic_flatmap/TestSwiftGenericStructDebugInfoGenericFlatMap.py @@ -12,4 +12,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwift, swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[requiresNonEmbeddedSwift, swiftTest]) diff --git a/lldb/test/API/lang/swift/variables/generic_tuple_labels/TestSwiftGenericTupleLabels.py b/lldb/test/API/lang/swift/variables/generic_tuple_labels/TestSwiftGenericTupleLabels.py index 4c72291c47ca2..b5f783d018c0c 100644 --- a/lldb/test/API/lang/swift/variables/generic_tuple_labels/TestSwiftGenericTupleLabels.py +++ b/lldb/test/API/lang/swift/variables/generic_tuple_labels/TestSwiftGenericTupleLabels.py @@ -26,7 +26,7 @@ class TestSwiftGenericTupleLabels(lldbtest.TestBase): def setUp(self): lldbtest.TestBase.setUp(self) - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_generic_tuple_labels(self): """Test that LLDB can reconstruct tuple labels from metadata""" diff --git a/lldb/test/API/lang/swift/variables/generics/TestSwiftGenericTypes.py b/lldb/test/API/lang/swift/variables/generics/TestSwiftGenericTypes.py index 5cb0382329a0e..e31af1d65e8db 100644 --- a/lldb/test/API/lang/swift/variables/generics/TestSwiftGenericTypes.py +++ b/lldb/test/API/lang/swift/variables/generics/TestSwiftGenericTypes.py @@ -20,7 +20,7 @@ class TestSwiftGenericTypes(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # embedded Swift monomorphizes every generic, so there is no unresolved static type to show @swiftTest def test_swift_generic_types(self): """Test support for generic types""" diff --git a/lldb/test/API/lang/swift/variables/inout/TestInOutVariables.py b/lldb/test/API/lang/swift/variables/inout/TestInOutVariables.py index 5ebd9c123e75c..55c4991cfc785 100644 --- a/lldb/test/API/lang/swift/variables/inout/TestInOutVariables.py +++ b/lldb/test/API/lang/swift/variables/inout/TestInOutVariables.py @@ -18,7 +18,7 @@ class TestInOutVariables(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift # embedded Swift strips initializers the program never calls, so Other(in1:in2:) is not in the binary @swiftTest def test_in_out_variables(self): """Test that @inout variables display reasonably""" diff --git a/lldb/test/API/lang/swift/variables/objc/TestSwiftObjCImportedTypes.py b/lldb/test/API/lang/swift/variables/objc/TestSwiftObjCImportedTypes.py index 6d3ddef097f1f..6667a15abc4d0 100644 --- a/lldb/test/API/lang/swift/variables/objc/TestSwiftObjCImportedTypes.py +++ b/lldb/test/API/lang/swift/variables/objc/TestSwiftObjCImportedTypes.py @@ -20,7 +20,7 @@ class TestSwiftObjCImportedTypes(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipUnlessDarwin def test_swift_objc_imported_types(self): diff --git a/lldb/test/API/lang/swift/variables/objc_optionals/TestSwiftObjCOptionals.py b/lldb/test/API/lang/swift/variables/objc_optionals/TestSwiftObjCOptionals.py index bcd35743dd955..ebcfe40bf3486 100644 --- a/lldb/test/API/lang/swift/variables/objc_optionals/TestSwiftObjCOptionals.py +++ b/lldb/test/API/lang/swift/variables/objc_optionals/TestSwiftObjCOptionals.py @@ -20,7 +20,7 @@ class TestSwiftObjCOptionalType(TestBase): - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipUnlessDarwin def test_swift_objc_optional_type(self): diff --git a/lldb/test/API/lang/swift/variables/swift/TestSwiftTypes.py b/lldb/test/API/lang/swift/variables/swift/TestSwiftTypes.py index 41a55afacda0c..7212848485f65 100644 --- a/lldb/test/API/lang/swift/variables/swift/TestSwiftTypes.py +++ b/lldb/test/API/lang/swift/variables/swift/TestSwiftTypes.py @@ -21,7 +21,7 @@ class TestSwiftTypes(TestBase): @swiftTest - @skipEmbeddedSwift + @skipEmbeddedSwift # printing the x86_64-only Float80 crashes LLDB in embedded Swift. def test_swift_types(self): """Test that we can inspect basic Swift types""" self.build() diff --git a/lldb/test/API/lang/swift/variables/uninitialized/TestSwiftUninitializedVariable.py b/lldb/test/API/lang/swift/variables/uninitialized/TestSwiftUninitializedVariable.py index d2af20255f573..8b712812c090c 100644 --- a/lldb/test/API/lang/swift/variables/uninitialized/TestSwiftUninitializedVariable.py +++ b/lldb/test/API/lang/swift/variables/uninitialized/TestSwiftUninitializedVariable.py @@ -4,5 +4,5 @@ lldbinline.MakeInlineTest( __file__, globals(), - decorators=[skipEmbeddedSwift, swiftTest], + decorators=[requiresNonEmbeddedSwift, swiftTest], ) diff --git a/lldb/test/API/lang/swift/variables/value_of_optionals/TestSwiftValueOfOptionals.py b/lldb/test/API/lang/swift/variables/value_of_optionals/TestSwiftValueOfOptionals.py index 56b87d9bd5ccd..865957636f571 100644 --- a/lldb/test/API/lang/swift/variables/value_of_optionals/TestSwiftValueOfOptionals.py +++ b/lldb/test/API/lang/swift/variables/value_of_optionals/TestSwiftValueOfOptionals.py @@ -22,7 +22,7 @@ class TestSwiftValueOfOptionalType(TestBase): TEST_WITH_PDB_DEBUG_INFO = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest def test_swift_value_optional_type(self): """Check that trying to read an optional's numeric value doesn't crash LLDB""" diff --git a/lldb/test/API/lang/swift/variadic_generics/TestSwiftVariadicGenerics.py b/lldb/test/API/lang/swift/variadic_generics/TestSwiftVariadicGenerics.py index 9989cc1d5005c..6fe3c7c1704ea 100644 --- a/lldb/test/API/lang/swift/variadic_generics/TestSwiftVariadicGenerics.py +++ b/lldb/test/API/lang/swift/variadic_generics/TestSwiftVariadicGenerics.py @@ -6,7 +6,7 @@ class TestSwiftVariadicGenerics(TestBase): NO_DEBUG_INFO_TESTCASE = True - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @swiftTest @skipIfAsan # rdar://152465885 Address Sanitizer assert doing `expr --bind-generic-types=false -- 0` def test(self): diff --git a/lldb/test/API/repl/cpp_exceptions/TestSwiftCPPExceptionsInREPL.py b/lldb/test/API/repl/cpp_exceptions/TestSwiftCPPExceptionsInREPL.py index 8daedb51ad3e9..45e9821283b83 100644 --- a/lldb/test/API/repl/cpp_exceptions/TestSwiftCPPExceptionsInREPL.py +++ b/lldb/test/API/repl/cpp_exceptions/TestSwiftCPPExceptionsInREPL.py @@ -31,7 +31,7 @@ def DISABLED_test_set_repl_mode_exceptions(self): self.main_source_file = lldb.SBFileSpec("main.swift") self.do_repl_mode_test() - @skipEmbeddedSwift + @requiresNonEmbeddedSwift @skipUnlessDarwin @swiftTest def test_repl_exceptions(self): From 3110ac18f0e797030d3758951d019551a2681d21 Mon Sep 17 00:00:00 2001 From: Augusto Noronha Date: Thu, 30 Jul 2026 12:20:16 -0700 Subject: [PATCH 2/2] fixup! [lldb] Discern embedded swift tests that can't run vs buggy ones --- lldb/test/API/lang/swift/any/TestSwiftAnyType.py | 1 + .../archetype_resolution/TestSwiftArchetypeResolution.py | 1 + .../test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py | 1 + lldb/test/API/lang/swift/class_error/TestClassError.py | 2 +- .../swift/command_memory_find/TestSwiftCommandMemoryFind.py | 1 + .../TestSwiftConventionCFunctionPointer.py | 1 + .../error_reporting/TestSwiftExpressionErrorReporting.py | 2 ++ .../TestGenericProtocolExtension.py | 2 +- .../API/lang/swift/generic_class/TestSwiftGenericClass.py | 1 + lldb/test/API/lang/swift/meta/TestSwiftMeta.py | 1 + lldb/test/API/lang/swift/opaque_type/TestSwiftOpaqueType.py | 1 + .../TestSwiftPrintObjectPointerAndTypeName_part01.py | 2 ++ .../TestSwiftPrintObjectPointerAndTypeName_part03.py | 4 ++++ .../substituted_typealias/TestSwiftSubstitutedTypeAlias.py | 2 +- lldb/test/API/lang/swift/union/TestSwiftCUnion.py | 1 + 15 files changed, 20 insertions(+), 3 deletions(-) diff --git a/lldb/test/API/lang/swift/any/TestSwiftAnyType.py b/lldb/test/API/lang/swift/any/TestSwiftAnyType.py index 303bfaa496e06..ae545a6666165 100644 --- a/lldb/test/API/lang/swift/any/TestSwiftAnyType.py +++ b/lldb/test/API/lang/swift/any/TestSwiftAnyType.py @@ -23,6 +23,7 @@ class TestSwiftAnyType(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) + @skipEmbeddedSwiftOnWindows @swiftTest def test_any_type(self): """Test the Any type""" diff --git a/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py b/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py index 81421f5d92686..d78d1a279b604 100644 --- a/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py +++ b/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py @@ -21,6 +21,7 @@ class TestSwiftArchetypeResolution(TestBase): @skipEmbeddedSwiftOnLinux # the embedded stdlib's hashing seed needs arc4random_buf, which does not link on Linux. + @skipEmbeddedSwiftOnWindows @swiftTest def test_swift_archetype_resolution(self): """Test that archetype-typed objects get resolved to their proper location in memory""" diff --git a/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py b/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py index 4648c2e67fc7d..18e6185cc27c6 100644 --- a/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py +++ b/lldb/test/API/lang/swift/c_compat_enum/TestSwiftCCompatEnum.py @@ -5,6 +5,7 @@ class TestSwiftCCompatEnum(TestBase): + @skipEmbeddedSwiftOnWindows @swiftTest def test(self): self.build() diff --git a/lldb/test/API/lang/swift/class_error/TestClassError.py b/lldb/test/API/lang/swift/class_error/TestClassError.py index 219ec22975294..64b903d494981 100644 --- a/lldb/test/API/lang/swift/class_error/TestClassError.py +++ b/lldb/test/API/lang/swift/class_error/TestClassError.py @@ -12,4 +12,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwiftOnWindows, swiftTest]) diff --git a/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py b/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py index 7c1955256a6a2..3b18892fb9ee2 100644 --- a/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py +++ b/lldb/test/API/lang/swift/command_memory_find/TestSwiftCommandMemoryFind.py @@ -19,6 +19,7 @@ def memory_find(self, name: str, expr: str, target): substrs=["data found at location"]) @skipEmbeddedSwiftOnLinux # `memory find -e` does not locate the value in embedded Swift on Linux. + @skipEmbeddedSwiftOnWindows @swiftTest def test(self): self.build() diff --git a/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py b/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py index df8601a4c63c2..335ad57af265a 100644 --- a/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py +++ b/lldb/test/API/lang/swift/convention_c_function_pointer/TestSwiftConventionCFunctionPointer.py @@ -6,6 +6,7 @@ class TestSwiftConventionCFunctionPointer(TestBase): @swiftTest + @skipEmbeddedSwiftOnWindows def test(self): self.build() self.runCmd("settings set symbols.swift-enable-ast-context false") diff --git a/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py b/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py index f2e42a7ca343d..d87f680fbecd7 100644 --- a/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py +++ b/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py @@ -7,6 +7,7 @@ class TestSwiftExpressionErrorReporting(TestBase): NO_DEBUG_INFO_TESTCASE = True @swiftTest + @skipEmbeddedSwiftOnWindows def test_missing_location(self): self.build() target, process, thread, bkpt = lldbutil.run_to_source_breakpoint( @@ -31,6 +32,7 @@ def test_missing_location(self): self.assertIn("no location for 'self' in debug info", all_messages) @swiftTest + @skipEmbeddedSwiftOnWindows def test_missing_var(self): """Test error reporting in expressions reports only diagnostics in user code""" diff --git a/lldb/test/API/lang/swift/expression/generic_protocol_extension/TestGenericProtocolExtension.py b/lldb/test/API/lang/swift/expression/generic_protocol_extension/TestGenericProtocolExtension.py index f5d12841fe8c6..1a9ad7ab476ec 100644 --- a/lldb/test/API/lang/swift/expression/generic_protocol_extension/TestGenericProtocolExtension.py +++ b/lldb/test/API/lang/swift/expression/generic_protocol_extension/TestGenericProtocolExtension.py @@ -12,4 +12,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwiftOnWindows, swiftTest]) diff --git a/lldb/test/API/lang/swift/generic_class/TestSwiftGenericClass.py b/lldb/test/API/lang/swift/generic_class/TestSwiftGenericClass.py index c6d6811f6cf46..bd7252655a97b 100644 --- a/lldb/test/API/lang/swift/generic_class/TestSwiftGenericClass.py +++ b/lldb/test/API/lang/swift/generic_class/TestSwiftGenericClass.py @@ -5,6 +5,7 @@ class SwiftGenericClassTest(TestBase): + @skipEmbeddedSwiftOnWindows @swiftTest def test(self): """Tests that a generic class type can be resolved from the instance metadata alone""" diff --git a/lldb/test/API/lang/swift/meta/TestSwiftMeta.py b/lldb/test/API/lang/swift/meta/TestSwiftMeta.py index 35de0bbf31231..0e7773bdaf68f 100644 --- a/lldb/test/API/lang/swift/meta/TestSwiftMeta.py +++ b/lldb/test/API/lang/swift/meta/TestSwiftMeta.py @@ -24,6 +24,7 @@ class TestSwiftMeta(lldbtest.TestBase): def test_swiftDecorator(self): self.assertTrue(self.getDebugInfo() != "gmodules") + @skipEmbeddedSwiftOnWindows @swiftTest def test_swiftBuild(self): self.build() diff --git a/lldb/test/API/lang/swift/opaque_type/TestSwiftOpaqueType.py b/lldb/test/API/lang/swift/opaque_type/TestSwiftOpaqueType.py index 811e39575e797..ef1e9d9b4273b 100644 --- a/lldb/test/API/lang/swift/opaque_type/TestSwiftOpaqueType.py +++ b/lldb/test/API/lang/swift/opaque_type/TestSwiftOpaqueType.py @@ -6,6 +6,7 @@ class TestSwiftOpaque(TestBase): + @skipEmbeddedSwiftOnWindows @swiftTest def test(self): """Test opaque types in parameter positions""" diff --git a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part01.py b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part01.py index 6b932a0d94a7c..01fce19d3b24a 100644 --- a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part01.py +++ b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part01.py @@ -16,6 +16,7 @@ def _filecheck(self, key): self.filecheck_log(self.log, __file__, f"-check-prefix=CHECK-{key}") @swiftTest + @skipEmbeddedSwiftOnWindows def test_int(self): self.build() lldbutil.run_to_source_breakpoint( @@ -26,6 +27,7 @@ def test_int(self): # CHECK-INT: stringForPrintObject(UnsafeRawPointer(bitPattern: {{[0-9]+}}), mangledTypeName: "SiD") @swiftTest + @skipEmbeddedSwiftOnWindows def test_string(self): self.build() lldbutil.run_to_source_breakpoint( diff --git a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part03.py b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part03.py index 14824291019db..672d30a68b286 100644 --- a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part03.py +++ b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName_part03.py @@ -16,6 +16,7 @@ def _filecheck(self, key): self.filecheck_log(self.log, __file__, f"-check-prefix=CHECK-{key}") @swiftTest + @skipEmbeddedSwiftOnWindows def test_described_struct(self): self.build() lldbutil.run_to_source_breakpoint( @@ -26,6 +27,7 @@ def test_described_struct(self): # CHECK-DESC-STRUCT: stringForPrintObject(UnsafeRawPointer(bitPattern: {{[0-9]+}}), mangledTypeName: "1a15DescribedStructVD") @swiftTest + @skipEmbeddedSwiftOnWindows def test_described_class(self): self.build() lldbutil.run_to_source_breakpoint( @@ -36,6 +38,7 @@ def test_described_class(self): # CHECK-DESC-CLASS: stringForPrintObject(UnsafeRawPointer(bitPattern: {{[0-9]+}}), mangledTypeName: "1a14DescribedClassCD") @swiftTest + @skipEmbeddedSwiftOnWindows def test_described_enum(self): self.build() lldbutil.run_to_source_breakpoint( @@ -46,6 +49,7 @@ def test_described_enum(self): # CHECK-DESC-ENUM: stringForPrintObject(UnsafeRawPointer(bitPattern: {{.*}}), mangledTypeName: "1a13DescribedEnumOD") @swiftTest + @skipEmbeddedSwiftOnWindows def test_class_only_protocol(self): self.build() lldbutil.run_to_source_breakpoint( diff --git a/lldb/test/API/lang/swift/substituted_typealias/TestSwiftSubstitutedTypeAlias.py b/lldb/test/API/lang/swift/substituted_typealias/TestSwiftSubstitutedTypeAlias.py index 64c7510582a94..d59d1140fe5d9 100644 --- a/lldb/test/API/lang/swift/substituted_typealias/TestSwiftSubstitutedTypeAlias.py +++ b/lldb/test/API/lang/swift/substituted_typealias/TestSwiftSubstitutedTypeAlias.py @@ -12,4 +12,4 @@ import lldbsuite.test.lldbinline as lldbinline from lldbsuite.test.decorators import * -lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest]) +lldbinline.MakeInlineTest(__file__, globals(), decorators=[skipEmbeddedSwiftOnWindows, swiftTest]) diff --git a/lldb/test/API/lang/swift/union/TestSwiftCUnion.py b/lldb/test/API/lang/swift/union/TestSwiftCUnion.py index d9866f3d3373d..8d8b302e1eec8 100644 --- a/lldb/test/API/lang/swift/union/TestSwiftCUnion.py +++ b/lldb/test/API/lang/swift/union/TestSwiftCUnion.py @@ -9,6 +9,7 @@ class TestSwiftCUnion(lldbtest.TestBase): mydir = lldbtest.TestBase.compute_mydir(__file__) + @skipEmbeddedSwiftOnWindows @swiftTest def test_c_unions(self): self.build()