Skip to content

Unconditionally add test targets #9329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −26
Open

Unconditionally add test targets #9329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 16 additions & 24 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,28 +991,6 @@ let package = Package(
name: "SwiftBuildSupportTests",
dependencies: ["SwiftBuildSupport", "_InternalTestSupport", "_InternalBuildTestSupport"]
),
// Examples (These are built to ensure they stay up to date with the API.)
.executableTarget(
name: "package-info",
dependencies: ["Workspace"],
path: "Examples/package-info/Sources/package-info"
)
],
swiftLanguageModes: [.v5]
)

#if canImport(Darwin)
package.targets.append(contentsOf: [
.executableTarget(
name: "swiftpm-testing-helper"
)
])
#endif

// rdar://101868275 "error: cannot find 'XCTAssertEqual' in scope" can affect almost any functional test, so we flat out
// disable them all until we know what is going on
if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] == nil {
package.targets.append(contentsOf: [
.testTarget(
name: "FunctionalTests",
dependencies: [
Expand Down Expand Up @@ -1055,9 +1033,23 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
"dummy-swiftc",
]
),
])
}
// Examples (These are built to ensure they stay up to date with the API.)
.executableTarget(
name: "package-info",
dependencies: ["Workspace"],
path: "Examples/package-info/Sources/package-info"
),
],
swiftLanguageModes: [.v5]
)

#if canImport(Darwin)
package.targets.append(contentsOf: [
.executableTarget(
name: "swiftpm-testing-helper"
)
])
#endif

func swiftSyntaxDependencies(_ names: [String]) -> [Target.Dependency] {
/// Whether swift-syntax is being built as a single dynamic library instead of as a separate library per module.
Expand Down
13 changes: 11 additions & 2 deletions Sources/_InternalTestSupport/SwiftTesting+TraitConditional.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,17 @@ extension Trait where Self == Testing.ConditionTrait {

// Enabled if the toolchain has supported features
public static var supportsSupportedFeatures: Self {
enabled("skipping because test environment compiler doesn't support `-print-supported-features`") {
(try? UserToolchain.default)!.supportsSupportedFeatures
let isEnabled: Bool
let errorInfo: String
do {
isEnabled = try UserToolchain.default.supportsSupportedFeatures
errorInfo = ""
} catch {
isEnabled = false
errorInfo = "Error: \(error)"
}
return enabled("Skipping because test environment compiler doesn't support `-print-supported-features`.\(errorInfo)") {
isEnabled
}
}

Expand Down