Skip to content

[bootstrap] Preemptively add argument for Foundation [AsyncXCTest 3/6] #176

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

Merged

Conversation

modocache
Copy link
Contributor

This is the third of six pull requests necessary to introduce asynchronous testing to swift-corelibs-xctest. This pull request may be reviewed and merged at any time.

swiftlang/swift-corelibs-xctest#43 will add a dependency between swift-corelibs-xctest and swift-corelibs-foundation. This will necessitate the path to a Foundation build be passed to the SwiftPM bootstrap script. See #177 for details on what this path will be used for.

In order to prevent CI from breaking, we'll modify the Swift build script to pass the correct parameters before those parameters are actually used. To do that, this commit ensures the bootstrap script accepts the new parameter: "--foundation".

@mike-ferris
Copy link

The README diff seems to remove the --build-tests part of the example invocation. No changes to the script seem to be related to that. Was this removed from the README in error or is that parameter not actually necessary?

@modocache
Copy link
Contributor Author

@mike-ferris-apple I've decided to make the documentation changes in #177, so I'll remove them from this pull request.

As for --build-tests: it's marked "deprecated" in the SwiftPM bootstrap script and is no longer used. I imagine it's still there because it used to be used by the Swift build script, but I removed it yesterday: swiftlang/swift#1547. I'll remove it altogether in a separate pull request.

swiftlang/swift-corelibs-xctest#43 will
add a dependency between swift-corelibs-xctest and
swift-corelibs-foundation. This will necessitate the path to
a Foundation build be passed to the SwiftPM bootstrap script.

In order to prevent CI from breaking, we'll modify the Swift
build script to pass the correct parameters *before* those
parameters are actually used. To do that, this commit ensures
the bootstrap script accepts the new parameter: "--foundation".
@modocache modocache force-pushed the xctest-foundation-arguments branch from ec456c9 to 794bb66 Compare March 7, 2016 00:53
@modocache modocache changed the title [bootstrap] Preemptively add argument for Foundation [bootstrap] Preemptively add argument for Foundation [AsyncXCTest 3/5] Mar 7, 2016
@modocache modocache changed the title [bootstrap] Preemptively add argument for Foundation [AsyncXCTest 3/5] [bootstrap] Preemptively add argument for Foundation [AsyncXCTest 3/6] Mar 7, 2016
@mike-ferris
Copy link

@swift-ci please test

@mike-ferris
Copy link

@swift-ci Please test

1 similar comment
@mike-ferris
Copy link

@swift-ci Please test

@modocache
Copy link
Contributor Author

The tests pass! 🎉

@kostiakoval or @mxcl, how do you feel about merging this? It's crucial to delivering asynchronous tests in corelibs-xctest, and I was kind of hoping to merge everything tonight.

@aciidgh
Copy link
Contributor

aciidgh commented Mar 8, 2016

LGTM ✋

@modocache
Copy link
Contributor Author

@aciidb0mb3r I don't suppose this could be the first pull request you merge? 🙏

kostiakoval added a commit that referenced this pull request Mar 8, 2016
[bootstrap] Preemptively add argument for Foundation [AsyncXCTest 3/6]
@kostiakoval kostiakoval merged commit df79e38 into swiftlang:master Mar 8, 2016
@kostiakoval
Copy link
Contributor

@modocache Done! Thanks for your work and sorry for delay.

@modocache modocache deleted the xctest-foundation-arguments branch March 8, 2016 08:28
@modocache
Copy link
Contributor Author

Thanks!!

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.

4 participants