[test] Tweak class_getImageName to correctly handle 2018 OS betas #18089
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
I messed up the condition here---'targetEnvironment(device)' is ignored and should be written '!targetEnvironment(simulator)'---but even besides that I didn't actually have the right conditions for which iOS devices this passes on and which it doesn't. Rather than trying to perfectly match this with an XFAIL, just skip the parts of the test that depend on having a new enough 2018 OS build if we, well, don't have it. rdar://problem/42398849
|
@swift-ci Please smoke test and merge |
jrose-apple
pushed a commit
to jrose-apple/swift
that referenced
this pull request
Jul 19, 2018
…nment (cherry picked from commit cdc7fb4)
jrose-apple
added a commit
that referenced
this pull request
Jul 20, 2018
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.
I messed up the condition here—
targetEnvironment(device)is ignored and should be written!targetEnvironment(simulator)—but even besides that I didn't actually have the right conditions for which iOS devices this passes on and which it doesn't. Rather than trying to perfectly match this with an XFAIL, just skip the parts of the test that depend on having a new enough 2018 OS build if we, well, don't have it.rdar://problem/42398849