Skip to content

Conversation

@3405691582
Copy link
Member

In #32137 direct environment variable parsing was introduced, the
availability of which is branched by a preprocessor symbol (ENVIRON)
if the environment is available directly on the platform, or if getenv
must be used.

The message expectation in the unit test in the however diverged on the
non-ENVIRON branch, causing a unit test failure. This PR fixes the
expectation, but also, while we're here, OpenBSD supports the ENVIRON
branch anyway.

In swiftlang#32137 direct environment variable parsing was introduced, the
availability of which is branched by a preprocessor symbol (`ENVIRON`)
if the environment is available directly on the platform, or if getenv
must be used.

The message expectation in the unit test in the however diverged on the
non-`ENVIRON` branch, causing a unit test failure. This PR fixes the
expectation, but also, while we're here, OpenBSD supports the `ENVIRON`
branch anyway.
@3405691582
Copy link
Member Author

cc @mikeash

@mikeash
Copy link
Contributor

mikeash commented Jun 5, 2020

Looks good, thank you! I must have failed to run the test on the getenv code after changing that message.

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Thanks!

@compnerd
Copy link
Member

compnerd commented Jun 5, 2020

@swift-ci please test

@compnerd compnerd merged commit 0e892a9 into swiftlang:master Jun 5, 2020
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.

3 participants