Skip to content

Add SwiftBuild coverage support #9162

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

Jump to bottom
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add SwiftBuild coverage support #9162

wants to merge 1 commit into from
+1,114 −569

Conversation

bkhouri
Copy link
Contributor

@bkhouri bkhouri commented Sep 20, 2025 •
edited
Loading

Ensure the SwiftBuild build system has feature parity with the Native build system as it relates to coverage.

Fixes: #9077
Fixes: #9197
Issue: rdar://159461439

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 20, 2025

@swift-ci test

owenv
owenv reviewed Sep 20, 2025
View reviewed changes
Tests/CommandsTests/BuildCommandTests.swift
)
func buildSystemOverrides(
buildSystem: BuildSystemProvider.Kind,
data: BuildData,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should default to running all these tests in debug and release - the difference isn't relevant to many of them and it extends the runtime quite a bit

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#8984 could say otherwise :)

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from c3cfde3 to 281fb9c Compare September 22, 2025 16:03
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 22, 2025

@swift-ci test self hosted

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from 281fb9c to 5a190d5 Compare September 23, 2025 15:35
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 23, 2025

@swift-ci test

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from 5a190d5 to 6ef6eb4 Compare September 23, 2025 16:05
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 23, 2025

@swift-ci test

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from 6ef6eb4 to ff983fb Compare September 25, 2025 00:53
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 25, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 25, 2025

@swift-ci test windows

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 25, 2025 •
edited
Loading

The macOS and Linux smoke builds failed for an infrastructure issue while cloning the dependant projects. Let's re-trigger them.

@swift-ci test linux

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 25, 2025

@swift-ci test macOS

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from ff983fb to 62a1f39 Compare September 25, 2025 13:36
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 25, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 25, 2025

@swift-ci test windows

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from 62a1f39 to 2d7b929 Compare September 26, 2025 14:26
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 26, 2025

@swift-ci test

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from 2d7b929 to a15f3a9 Compare September 26, 2025 19:31
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 26, 2025

@swift-ci test

@bkhouri bkhouri mentioned this pull request Sep 29, 2025
Open
1 task
@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from a15f3a9 to fed4fd3 Compare September 29, 2025 01:16
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 29, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 29, 2025

@swift-ci test windows

@bkhouri bkhouri mentioned this pull request Sep 29, 2025
Draft
@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from fed4fd3 to 94b19a7 Compare September 29, 2025 05:45
bkhouri
bkhouri commented Sep 29, 2025
View reviewed changes
Copy link
Contributor Author

@bkhouri bkhouri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 29, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 29, 2025

@swift-ci test windows

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch 2 times, most recently from 10f73c5 to 36782ed Compare September 29, 2025 14:10
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 29, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 29, 2025

@swift-ci test windows

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from 36782ed to 399ac4a Compare September 29, 2025 20:31
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 29, 2025

@swift-ci test

1 similar comment
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 29, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 30, 2025

The following test failed

[2025-09-29T23:48:18.751Z] × Test hostCircuitBreaker() recorded an issue at HTTPClientTests.swift:295:19: Expectation failed: an error was expected but none was thrown and "HTTPClientResponse(statusCode: 569, statusText: nil, headers: Basics.HTTPClientHeaders(items: [], headers: [:]), body: nil)" was returned

Let's re-trigger the job
@swift-ci test self hosted windows

@bkhouri bkhouri mentioned this pull request Sep 30, 2025
Closed
@bkhouri
Copy link
Contributor Author

bkhouri commented Sep 30, 2025

@swift-ci test self hosted windows

@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from 399ac4a to 9f4dc3b Compare October 1, 2025 13:34
@bkhouri
Copy link
Contributor Author

bkhouri commented Oct 1, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Oct 1, 2025

@swift-ci test windows

@bkhouri bkhouri requested a review from owenv October 1, 2025 20:00
@bkhouri bkhouri enabled auto-merge (squash) October 1, 2025 20:03
bripeticca
bripeticca reviewed Oct 1, 2025
View reviewed changes
Copy link
Contributor

@bripeticca bripeticca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just a couple of comments 😄

Tests/CommandsTests/BuildCommandTests.swift
let moduleBRegex = try Regex(#"B[.]swiftmodule[/].*[.]swiftmodule"#)
#expect(result.moduleContents.contains { $0.contains(moduleARegex) })
#expect(result.moduleContents.contains { $0.contains(moduleBRegex) })
case .swiftbuild, .xcode:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: thank you for using this syntax rather than defaulting to default! I find it's easier to find switch-cases that need updating once you add a new case to the enum 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the whole reason I didn't use default. It's rather have a compiler error than a runtime behavioural issue :)

@bkhouri
Add SwiftBuild coverage support
2059e18 
Ensure the SwiftBuild build systam has feature parity with the Native
build system as it relates to coverage.

Fixes: swiftlang#9077
Fixes: swiftlang#9197
Issue: rdar://159461439
@bkhouri bkhouri force-pushed the t/main/gh9077_rdar159461439_SwiftBuildWithCoverage branch from 9f4dc3b to 2059e18 Compare October 1, 2025 22:06
@bkhouri
Copy link
Contributor Author

bkhouri commented Oct 1, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Oct 1, 2025

@swift-ci test windows

@bkhouri bkhouri requested a review from bripeticca October 1, 2025 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakepetroules jakepetroules Awaiting requested review from jakepetroules jakepetroules is a code owner

@dschaefer2 dschaefer2 Awaiting requested review from dschaefer2 dschaefer2 is a code owner

@shawnhyam shawnhyam Awaiting requested review from shawnhyam shawnhyam is a code owner

@plemarquand plemarquand Awaiting requested review from plemarquand plemarquand is a code owner

@cmcgee1024 cmcgee1024 Awaiting requested review from cmcgee1024 cmcgee1024 is a code owner

@daveyc123 daveyc123 Awaiting requested review from daveyc123 daveyc123 is a code owner

@rconnell9 rconnell9 Awaiting requested review from rconnell9 rconnell9 is a code owner

@owenv owenv Awaiting requested review from owenv owenv is a code owner

@bripeticca bripeticca Awaiting requested review from bripeticca bripeticca is a code owner

1 more reviewer

@jabari-max jabari-max jabari-max approved these changes

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@bkhouri @owenv @bripeticca @jabari-max