[test] Invert stdlib_dir conditional sense.#33065
Merged
CodaFi merged 1 commit intoswiftlang:masterfrom Jul 23, 2020
Merged
Conversation
Member
Author
|
cc @artemcm |
In swiftlang#32903, a substitution pseudovariable was introduced to refer to the path containing Swift.swiftmodule. Since builds on Linux put this file in a path with a subdirectory named after the architecture name -- and presumably builds on mac OS do not, a conditional was required to distinguish these two cases. However, builds on OpenBSD for example also put Swift.swiftmodule in a similar subdirectory like Linux. Thus, invert the sense of this conditional to encompass both Linux, OpenBSD, and make mac OS the specific case, which it is here.
3405691582
force-pushed
the
StdlibModule_NotJustLinux
branch
from
e99e046 to
a86a540
Compare
Contributor
|
Makes sense to me @swift-ci smoke test |
Contributor
|
@swift-ci Please test Windows platform |
Contributor
|
Windows CI ran out of disk space. ⛵️ |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
In #32903, a substitution pseudovariable was introduced to refer to the
path containing Swift.swiftmodule. Since builds on Linux put this file
in a path with a subdirectory named after the architecture name -- and
presumably builds on mac OS do not, a conditional was required to
distinguish these two cases.
However, builds on OpenBSD for example also put Swift.swiftmodule in a
similar subdirectory like Linux. Thus, invert the sense of this
conditional: if mac OS, refer to the path without architecture name,
otherwise in all other cases (and therefore all other platforms), refer
to the architecture name subdirectory.