Skip to content

Conversation

hartbit
Copy link
Contributor

@hartbit hartbit commented Mar 23, 2019

This will allow merging the SwiftPM build animation without failing those tests: swiftlang/swift-package-manager#2050

@hartbit
Copy link
Contributor Author

hartbit commented Mar 23, 2019

@aciidb0mb3r what do you think?

// RUN: mkdir -p %t.dir
// RUN: cp -r %S/foo %t.dir/
// RUN: %{swift-test} --package-path %t.dir/foo --enable-code-coverage -v 2>&1 | tee %t.build-log
// RUN: %{swift} test --package-path %t.dir/foo --enable-code-coverage -v 2>&1 | tee %t.build-log
Copy link
Contributor

Choose a reason for hiding this comment

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

why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This line is a revert from the previous PR: this specific test can't work correctly against a custom SwiftPM binary because it expects to find code coverage information in the same folder. It basically only works with a toolchain.

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool, feel free to test and merge this!

@aciidgh
Copy link
Contributor

aciidgh commented Mar 23, 2019

One minor comment but looks good, thanks!

@hartbit
Copy link
Contributor Author

hartbit commented Mar 24, 2019

@aciidb0mb3r I've tested this PR in swiftlang/swift#23417. Can you merge it for me? I don't have merge rights on this repo.

@aciidgh aciidgh merged commit c96cdf3 into swiftlang:master Mar 24, 2019
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.

2 participants