[test][gardening] Prefer os(macOS) over os(OSX)
#15141
Merged
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
|
@swift-ci smoke test |
CodaFi
reviewed
Mar 10, 2018
| @@ -27,7 +27,7 @@ var i = Foo() | |||
| #endif | |||
| var j = i | |||
|
|
|||
| #if os(OSX) | |||
| #if os(macOS) | |||
There was a problem hiding this comment.
Be careful changing the ConditionalCompilation tests. I would like this one preserved and a macOS test added here.
There was a problem hiding this comment.
Be careful changing the ConditionalCompilation tests.
Good point! I think the both OSX and macOS conditions are specifically tested in https://github.com/apple/swift/blob/c26f40b45b3d21fb5844c71549ee23baa4f7b855/test/Parse/ConditionalCompilation/x64OSXTarget.swift#L4-L15 (https://github.com/apple/swift/pull/3395/files#diff-ddecd035914171df461e408178c90007),
but preserving the OSX test and adding a macOS test to this file would be good anyway.
ikesyo
force-pushed
the
if-os-macos-in-test
branch
from
152d0cf to
b68be20
Compare
|
@swift-ci Please smoke test and merge |
|
@swift-ci smoke test and merge |
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.
Refs: #15106, #15087, #13315