Skip to content
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.

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

[6.0] Build and install swift-testing in toolchains #75837

Merged
merged 11 commits into from
Aug 22, 2024

Conversation

rintaro
Copy link
Member

@rintaro rintaro commented Aug 12, 2024

Cherry-pick #75515 and #75909 into release/6.0

  • Explanation: As mentioned in the (now approved) A New Direction for Testing in Swift vision document, include the swift-testing project in Swift toolchains.
  • Scope: Packaging, SwiftPM, SwiftTesting
  • Risk: Low-Mid. This is a build-script only changes without any application code changes. As swift-testing in toolchain is a new addition, it won't break existing files. That being said, swiftpm may changes the behavior depending on the existence of swift-testing in the search paths.
  • Testing: Passes current test suite. Manually tested PR toolchains
  • Issues: rdar://123924911
  • Reviewer: Eric Miotto (@edymtt), Evan Wilde (@etcwilde)

@rintaro
Copy link
Member Author

rintaro commented Aug 12, 2024

@finagolfin
Copy link
Member

Note that now that swift-testing is in the trunk toolchain, automated snapshot tags will need to be added to that repo, else a tag checkout will give you a random commit from trunk. I think @shahmishal sets that up, don't know if anybody else can.

@rintaro rintaro force-pushed the 6.0-add-swift-testing branch from e13b4ce to 5cfa8dc Compare August 13, 2024 21:52
@rintaro
Copy link
Member Author

rintaro commented Aug 13, 2024

@rintaro
Copy link
Member Author

rintaro commented Aug 15, 2024

@rintaro rintaro force-pushed the 6.0-add-swift-testing branch from 5cfa8dc to 33b3fec Compare August 15, 2024 20:57
@rintaro
Copy link
Member Author

rintaro commented Aug 15, 2024

@rintaro
Copy link
Member Author

rintaro commented Aug 15, 2024

swiftlang/swift-installer-scripts#327
@swift-ci Please build toolchain macOS

@rintaro
Copy link
Member Author

rintaro commented Aug 15, 2024

swiftlang/swift-installer-scripts#327
@swift-ci Please build toolchain Windows

@rintaro
Copy link
Member Author

rintaro commented Aug 15, 2024

swiftlang/swift-installer-scripts#327
@swift-ci Please build toolchain Linux

@rintaro
Copy link
Member Author

rintaro commented Aug 15, 2024

stmontgomery and others added 9 commits August 20, 2024 09:48
…nto toolchains (on Darwin, so far)

(cherry picked from commit 97e85a6)
(cherry picked from commit 155e4c8)
* Remove SwiftSyntax product dependency
* Correct CMAKE_BUILD_TYPE

(cherry picked from commit e06d38b)
 * Basically following XCTest scheme.
 * Build TestingMacro separately from Testing library and install it to
   the toolchain's `bin`
 * Testing swift-testing itself is TODO

(cherry picked from commit f069aec)
Also, build them for all hosts including cross compiling host.

(cherry picked from commit e98c5ea)
@rintaro
Copy link
Member Author

rintaro commented Aug 21, 2024

SwiftPM now depends on `SwiftTesting`, `SwiftTesting` depends on
`SwiftTestingMacros`

rdar://133946466
(cherry picked from commit 852aa77)
@rintaro rintaro force-pushed the 6.0-add-swift-testing branch from 2960084 to a324b5c Compare August 21, 2024 19:41
@rintaro
Copy link
Member Author

rintaro commented Aug 21, 2024

@rintaro rintaro marked this pull request as ready for review August 21, 2024 19:44
@rintaro rintaro requested a review from a team as a code owner August 21, 2024 19:44
@rintaro
Copy link
Member Author

rintaro commented Aug 21, 2024

@rintaro
Copy link
Member Author

rintaro commented Aug 21, 2024

@rintaro
Copy link
Member Author

rintaro commented Aug 21, 2024

@rintaro rintaro merged commit 222fd1d into swiftlang:release/6.0 Aug 22, 2024
8 checks passed
rintaro added a commit to rintaro/swift that referenced this pull request Aug 22, 2024
* Add swift-testing to update-checkout

(cherry picked from commit 19910c6)

* Build script changes to begin building and installing swift-testing into toolchains (on Darwin, so far)

(cherry picked from commit 97e85a6)

* Add swift-testing to Linux presets too

(cherry picked from commit ff5ece1)

* Improve description of new build-script flags

(cherry picked from commit c8d7d13)

* Fix header comment

(cherry picked from commit 155e4c8)

* [swift-testing] Build tweak

* Remove SwiftSyntax product dependency
* Correct CMAKE_BUILD_TYPE

(cherry picked from commit e06d38b)

* [Windows] Build and install swift-testing in Windows toolchains

 * Basically following XCTest scheme.
 * Build TestingMacro separately from Testing library and install it to
   the toolchain's `bin`
 * Testing swift-testing itself is TODO

(cherry picked from commit f069aec)

* [build-preset] Add swift-testing to incrmental bots

(cherry picked from commit 6a38329)

* [build-script] Separate SwiftTestinMacros from SwiftTesting product

Also, build them for all hosts including cross compiling host.

(cherry picked from commit e98c5ea)

* [6.0] Add swift-testing to update-checkout-config.json

To release/6.0 scheme.

* [build-script] Fix product dependencies

SwiftPM now depends on `SwiftTesting`, `SwiftTesting` depends on
`SwiftTestingMacros`

rdar://133946466
(cherry picked from commit 852aa77)

---------

Co-authored-by: Stuart Montgomery <[email protected]>
(cherry picked from commit 222fd1d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants