Skip to content

Build an index store for test targets if test discovery is enabled #2401

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

Merged
merged 1 commit into from
Nov 7, 2019
Merged

Build an index store for test targets if test discovery is enabled #2401

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
20 changes: 14 additions & 6 deletions Sources/Build/BuildPlan.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,23 @@ public struct BuildParameters: Encodable {
}

/// Returns the compiler arguments for the index store, if enabled.
fileprivate var indexStoreArguments: [String] {
fileprivate func indexStoreArguments(for target: ResolvedTarget) -> [String] {
let addIndexStoreArguments: Bool
switch indexStoreMode {
case .on:
addIndexStoreArguments = true
case .off:
addIndexStoreArguments = false
case .auto:
addIndexStoreArguments = configuration == .debug
if configuration == .debug {
addIndexStoreArguments = true
} else if enableTestDiscovery && target.type == .test {
// Test discovery requires an index store for the test targets
// to discover the tests
addIndexStoreArguments = true
} else {
addIndexStoreArguments = false
}
}

if addIndexStoreArguments {
Expand Down Expand Up @@ -414,9 +422,9 @@ public final class ClangTargetBuildDescription {
// This feature is not widely available in OSS clang. So, we only enable
// index store for Apple's clang or if explicitly asked to.
if ProcessEnv.vars.keys.contains("SWIFTPM_ENABLE_CLANG_INDEX_STORE") {
args += buildParameters.indexStoreArguments
args += buildParameters.indexStoreArguments(for: target)
} else if buildParameters.triple.isDarwin(), (try? buildParameters.toolchain._isClangCompilerVendorApple()) == true {
args += buildParameters.indexStoreArguments
args += buildParameters.indexStoreArguments(for: target)
}

if !buildParameters.triple.isWindows() {
Expand Down Expand Up @@ -665,7 +673,7 @@ public final class SwiftTargetBuildDescription {
case .release: break
}

args += buildParameters.indexStoreArguments
args += buildParameters.indexStoreArguments(for: target)
args += buildParameters.toolchain.extraSwiftCFlags
args += optimizationArguments
args += ["-g"]
Expand Down Expand Up @@ -787,7 +795,7 @@ public final class SwiftTargetBuildDescription {
result += buildParameters.targetTripleArgs(for: target)
result += ["-swift-version", swiftVersion.rawValue]

result += buildParameters.indexStoreArguments
result += buildParameters.indexStoreArguments(for: target)
result += buildParameters.toolchain.extraSwiftCFlags
result += optimizationArguments
result += ["-g"]
Expand Down