Skip to content

Commit d3c1175

Browse files
bkhouribkhouri
authored
Clean up test traits (#9214)
1 parent acd7b00 commit d3c1175

File tree

6 files changed

+20
-75
lines changed

6 files changed

+20
-75
lines changed

‎Sources/_InternalTestSupport/SwiftTesting+TraitsBug.swift‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,4 @@ extension Trait where Self == Testing.Bug {
7575
relationship: .defect,
7676
)
7777
}
78-
79-
public static var IssueSwiftBuildLinuxRunnable: Self {
80-
.issue(
81-
"https://github.com/swiftlang/swift-package-manager/issues/8416",
82-
relationship: .defect,
83-
)
84-
}
85-
86-
public static var IssueCannnotOpenSharedObjectFileLibSwiftCore : Self {
87-
// /tmp/Miscellaneous_PackageEdit.H5ku8Q/foo/.build/aarch64-unknown-linux-gnu/Products/Debug-linux/foo: error while loading shared libraries: libswiftCore.so: cannot open shared object file: No such file or directory
88-
.issue(
89-
"https://github.com/swiftlang/swift-package-manager/issues/8416",
90-
relationship: .defect,
91-
)
92-
}
9378
}

‎Tests/CommandsTests/PackageCommandTests.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2581,7 +2581,6 @@ struct PackageCommandTests {
25812581
.issue("https://github.com/swiftlang/swift-package-manager/issues/8774", relationship: .defect),
25822582
.issue("https://github.com/swiftlang/swift-package-manager/issues/8380", relationship: .defect),
25832583
.issue("https://github.com/swiftlang/swift-package-manager/issues/8416", relationship: .defect), // swift run linux issue with swift build,
2584-
.IssueCannnotOpenSharedObjectFileLibSwiftCore,
25852584
.tags(
25862585
.Feature.Command.Package.Edit,
25872586
.Feature.Command.Package.Unedit,
@@ -2902,7 +2901,6 @@ struct PackageCommandTests {
29022901
// windows long path issue
29032902
.issue("https://github.com/swiftlang/swift-package-manager/issues/8774", relationship: .defect),
29042903
.issue("https://github.com/swiftlang/swift-package-manager/issues/8380", relationship: .defect),
2905-
.IssueCannnotOpenSharedObjectFileLibSwiftCore,
29062904
.tags(
29072905
.Feature.Command.Build,
29082906
.Feature.Command.Package.Resolve,

‎Tests/FunctionalTests/DependencyResolutionTests.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import enum TSCUtility.Git
2929
)
3030
struct DependencyResolutionTests {
3131
@Test(
32-
.IssueSwiftBuildLinuxRunnable,
3332
.IssueWindowsLongPath,
3433
.IssueProductTypeForObjectLibraries,
3534
.tags(
@@ -161,7 +160,6 @@ struct DependencyResolutionTests {
161160
}
162161

163162
@Test(
164-
.IssueSwiftBuildLinuxRunnable,
165163
.IssueWindowsLongPath,
166164
.tags(
167165
Tag.Feature.Command.Build,

‎Tests/FunctionalTests/PluginTests.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,7 +1445,6 @@ final class PluginTests {
14451445
.issue("https://github.com/swiftlang/swift-package-manager/issues/9040", relationship: .verifies),
14461446
.IssueWindowsCannotSaveAttachment,
14471447
.requiresSwiftConcurrencySupport,
1448-
.IssueSwiftBuildLinuxRunnable,
14491448
arguments: getBuildData(for: SupportedBuildSystemOnAllPlatforms), try getFiles(in: RelativePath(validating: "Fixtures/Miscellaneous/Plugins/PluginsAndSnippets/Snippets"), matchingExtension: "swift",),
14501449
)
14511450
func testBasicRunSnippets(
@@ -1465,7 +1464,7 @@ final class PluginTests {
14651464
#expect(stdout.contains("hello, snippets"), "stderr: \(stderr)")
14661465
}
14671466
} when: {
1468-
[.windows, .linux].contains(ProcessInfo.hostOperatingSystem) && data.buildSystem == .swiftbuild
1467+
[.windows].contains(ProcessInfo.hostOperatingSystem) && data.buildSystem == .swiftbuild
14691468
}
14701469
}
14711470
}

‎Tests/FunctionalTests/TraitTests.swift‎

Lines changed: 19 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ struct TraitTests {
2929
@Test(
3030
.IssueWindowsPathTestsFailures,
3131
.IssueWindowsRelativePathAssert,
32-
.IssueSwiftBuildLinuxRunnable,
3332
.IssueProductTypeForObjectLibraries,
3433
.tags(
3534
Tag.Feature.Command.Run,
@@ -40,9 +39,7 @@ struct TraitTests {
4039
buildSystem: BuildSystemProvider.Kind,
4140
configuration: BuildConfiguration,
4241
) async throws {
43-
try await withKnownIssue("""
44-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416
45-
""", isIntermittent: (ProcessInfo.hostOperatingSystem == .linux) || (ProcessInfo.hostOperatingSystem == .windows && buildSystem == .swiftbuild)) {
42+
try await withKnownIssue(isIntermittent: (ProcessInfo.hostOperatingSystem == .windows && buildSystem == .swiftbuild)) {
4643
try await fixture(name: "Traits") { fixturePath in
4744
let (stdout, stderr) = try await executeSwiftRun(
4845
fixturePath.appending("Example"),
@@ -66,14 +63,13 @@ struct TraitTests {
6663
}
6764
} when: {
6865
(ProcessInfo.hostOperatingSystem == .windows && (CiEnvironment.runningInSmokeTestPipeline || buildSystem == .swiftbuild))
69-
|| (buildSystem == .swiftbuild && [.linux, .windows].contains(ProcessInfo.hostOperatingSystem))
66+
|| (buildSystem == .swiftbuild && [.windows].contains(ProcessInfo.hostOperatingSystem))
7067
}
7168
}
7269

7370
@Test(
7471
.IssueWindowsPathTestsFailures,
7572
.IssueWindowsRelativePathAssert,
76-
.IssueSwiftBuildLinuxRunnable,
7773
.IssueProductTypeForObjectLibraries,
7874
.tags(
7975
Tag.Feature.Command.Run,
@@ -86,7 +82,6 @@ struct TraitTests {
8682
) async throws {
8783
try await withKnownIssue(
8884
"""
89-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416
9085
Windows: "https://github.com/swiftlang/swift-build/issues/609"
9186
""",
9287
isIntermittent: (ProcessInfo.hostOperatingSystem == .windows),
@@ -126,7 +121,6 @@ struct TraitTests {
126121
@Test(
127122
.IssueWindowsPathTestsFailures,
128123
.IssueWindowsRelativePathAssert,
129-
.IssueSwiftBuildLinuxRunnable,
130124
.IssueProductTypeForObjectLibraries,
131125
.tags(
132126
Tag.Feature.Command.Run,
@@ -139,7 +133,6 @@ struct TraitTests {
139133
) async throws {
140134
try await withKnownIssue(
141135
"""
142-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416,
143136
Windows: https://github.com/swiftlang/swift-build/issues/609
144137
""",
145138
isIntermittent: (ProcessInfo.hostOperatingSystem == .windows),
@@ -176,7 +169,6 @@ struct TraitTests {
176169
@Test(
177170
.IssueWindowsPathTestsFailures,
178171
.IssueWindowsRelativePathAssert,
179-
.IssueSwiftBuildLinuxRunnable,
180172
.IssueProductTypeForObjectLibraries,
181173
.tags(
182174
Tag.Feature.Command.Run,
@@ -189,7 +181,6 @@ struct TraitTests {
189181
) async throws {
190182
try await withKnownIssue(
191183
"""
192-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416,
193184
Windows: https://github.com/swiftlang/swift-build/issues/609
194185
""",
195186
isIntermittent: (ProcessInfo.hostOperatingSystem == .windows),
@@ -230,7 +221,6 @@ struct TraitTests {
230221
@Test(
231222
.IssueWindowsPathTestsFailures,
232223
.IssueWindowsRelativePathAssert,
233-
.IssueSwiftBuildLinuxRunnable,
234224
.IssueProductTypeForObjectLibraries,
235225
.tags(
236226
Tag.Feature.Command.Run,
@@ -241,10 +231,7 @@ struct TraitTests {
241231
buildSystem: BuildSystemProvider.Kind,
242232
configuration: BuildConfiguration,
243233
) async throws {
244-
try await withKnownIssue("""
245-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416,
246-
""",
247-
isIntermittent: (ProcessInfo.hostOperatingSystem == .windows && buildSystem == .swiftbuild)) {
234+
try await withKnownIssue(isIntermittent: (ProcessInfo.hostOperatingSystem == .windows && buildSystem == .swiftbuild)) {
248235
try await fixture(name: "Traits") { fixturePath in
249236
let (stdout, stderr) = try await executeSwiftRun(
250237
fixturePath.appending("Example"),
@@ -271,7 +258,6 @@ struct TraitTests {
271258
@Test(
272259
.IssueWindowsPathTestsFailures,
273260
.IssueWindowsRelativePathAssert,
274-
.IssueSwiftBuildLinuxRunnable,
275261
.IssueProductTypeForObjectLibraries,
276262
.tags(
277263
Tag.Feature.Command.Run,
@@ -283,7 +269,6 @@ struct TraitTests {
283269
configuration: BuildConfiguration,
284270
) async throws {
285271
try await withKnownIssue("""
286-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416,
287272
Windows: https://github.com/swiftlang/swift-build/issues/609
288273
""",
289274
isIntermittent: (ProcessInfo.hostOperatingSystem == .windows && buildSystem == .swiftbuild),
@@ -317,7 +302,6 @@ struct TraitTests {
317302
@Test(
318303
.IssueWindowsPathTestsFailures,
319304
.IssueWindowsRelativePathAssert,
320-
.IssueSwiftBuildLinuxRunnable,
321305
.IssueProductTypeForObjectLibraries,
322306
.tags(
323307
Tag.Feature.Command.Run,
@@ -330,7 +314,6 @@ struct TraitTests {
330314
) async throws {
331315
try await withKnownIssue(
332316
"""
333-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416,
334317
Windows: https://github.com/swiftlang/swift-build/issues/609
335318
""",
336319
isIntermittent: (ProcessInfo.hostOperatingSystem == .windows),
@@ -374,7 +357,6 @@ struct TraitTests {
374357
@Test(
375358
.IssueWindowsPathTestsFailures,
376359
.IssueWindowsRelativePathAssert,
377-
.IssueSwiftBuildLinuxRunnable,
378360
.IssueProductTypeForObjectLibraries,
379361
.tags(
380362
Tag.Feature.Command.Run,
@@ -387,7 +369,6 @@ struct TraitTests {
387369
) async throws {
388370
try await withKnownIssue(
389371
"""
390-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416,
391372
Windows: https://github.com/swiftlang/swift-build/issues/609
392373
""",
393374
isIntermittent: (ProcessInfo.hostOperatingSystem == .windows)
@@ -615,7 +596,6 @@ struct TraitTests {
615596
}
616597

617598
@Test(
618-
.IssueSwiftBuildLinuxRunnable,
619599
.tags(
620600
Tag.Feature.Command.Run,
621601
),
@@ -626,38 +606,29 @@ struct TraitTests {
626606
configuration: BuildConfiguration,
627607
) async throws {
628608
try await fixture(name: "Traits") { fixturePath in
629-
try await withKnownIssue("""
630-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416,
631-
""",
632-
isIntermittent: true,
633-
) {
634-
let error = await #expect(throws: SwiftPMError.self) {
635-
try await executeSwiftRun(
636-
fixturePath.appending("DisablingEmptyDefaultsExample"),
637-
"DisablingEmptyDefaultsExample",
638-
configuration: configuration,
639-
buildSystem: buildSystem,
640-
)
641-
}
609+
let error = await #expect(throws: SwiftPMError.self) {
610+
try await executeSwiftRun(
611+
fixturePath.appending("DisablingEmptyDefaultsExample"),
612+
"DisablingEmptyDefaultsExample",
613+
configuration: configuration,
614+
buildSystem: buildSystem,
615+
)
616+
}
642617

643-
guard case SwiftPMError.executionFailure(_, _, let stderr) = try #require(error) else {
644-
Issue.record("Incorrect error was raised.")
645-
return
646-
}
618+
guard case SwiftPMError.executionFailure(_, _, let stderr) = try #require(error) else {
619+
Issue.record("Incorrect error was raised.")
620+
return
621+
}
647622

648-
let expectedErr = """
649-
error: Disabled default traits by package 'disablingemptydefaultsexample' (DisablingEmptyDefaultsExample) on package 'package11' (Package11) that declares no traits. This is prohibited to allow packages to adopt traits initially without causing an API break.
623+
let expectedErr = """
624+
error: Disabled default traits by package 'disablingemptydefaultsexample' (DisablingEmptyDefaultsExample) on package 'package11' (Package11) that declares no traits. This is prohibited to allow packages to adopt traits initially without causing an API break.
650625
651-
"""
652-
#expect(stderr.contains(expectedErr))
653-
} when: {
654-
buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem == .linux
655-
}
626+
"""
627+
#expect(stderr.contains(expectedErr))
656628
}
657629
}
658630

659631
@Test(
660-
.IssueSwiftBuildLinuxRunnable,
661632
.IssueProductTypeForObjectLibraries,
662633
.tags(
663634
Tag.Feature.Command.Run,
@@ -705,7 +676,6 @@ struct TraitTests {
705676
) async throws {
706677
try await withKnownIssue(
707678
"""
708-
Linux: https://github.com/swiftlang/swift-package-manager/issues/8416,
709679
Windows: https://github.com/swiftlang/swift-build/issues/609
710680
""",
711681
isIntermittent: (ProcessInfo.hostOperatingSystem == .windows),

‎Tests/IntegrationTests/SwiftPMTests.swift‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ private struct SwiftPMTests {
8484
}
8585

8686
@Test(
87-
.IssueSwiftBuildLinuxRunnable,
88-
.bug(
89-
"https://github.com/swiftlang/swift-package-manager/issues/8514",
90-
"[Windows] Integration test SwiftPMTests.packageInitExecutable with --build-system swiftbuild is skipped"
91-
),
9287
.tags(
9388
Tag.Feature.Command.Package.Init,
9489
Tag.Feature.PackageType.Executable,

0 commit comments

Comments
 (0)