[5.5] fix a bug in test discovery where tests define in extensions break the discovery #3435
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e discovery (swiftlang#3433) motivation: less bugs, happier users changes: modify test discovery code to key of class name rather than blindly iterate over tetst rdar://58435666
tomerd
requested review from
abertelrud,
friedbunny and
neonichu
as code owners
|
@swift-ci please test |
abertelrud
reviewed
Apr 23, 2021
| stream <<< "import XCTest" <<< "\n" | ||
| stream <<< "@testable import " <<< module <<< "\n" | ||
|
|
||
| for klass in tests { | ||
| for classTests in testsByClass { |
There was a problem hiding this comment.
Since this is now iterating over a dictionary instead of an array, should the keys be sorted here to avoid spurious differences in how the output file is emitted?
There was a problem hiding this comment.
do you mean so that the output won't cause unnecessary compiles? if so, I think this is a good idea but I would do that in a separate optimization PR on main, and let the fix through as-is in 5.5
There was a problem hiding this comment.
Yes, that's what I meant — just to always have stable outputs. Agreed that it can be done separately.
abertelrud
reviewed
Apr 23, 2021
| @@ -74,8 +78,8 @@ final class TestDiscoveryCommand: CustomLLBuildCommand { | |||
| return [\n | |||
| """ | |||
|
|
|||
| for klass in tests { | |||
| stream <<< indent(8) <<< "testCase(\(klass.name).__allTests__\(klass.name)),\n" | |||
| for className in testsByClass.keys { | |||
There was a problem hiding this comment.
Same question here about order.
abertelrud
approved these changes
Apr 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
bring #3433 to 5.5