Skip to content

Determine the Timezone directory to use at runtime on macOS. #1341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2017

Conversation

spevans
Copy link
Contributor

@spevans spevans commented Nov 27, 2017

  • The timezone directory changed on macOS 10.13 so get the os version
    at runtime and set the timezone directory dynamically. This allows
    the tests to be run on 10.12 and 10.13

  • Added __InitTZStrings() for both Linux and macOS to work the same
    way as Windows.

Reapplication of #1126 / #1163 after revert in #1338

- The timezone directory changed on macOS 10.13 so get the os version
  at runtime and set the timezone directory dynamically. This allows
  the tests to be run on 10.12 and 10.13

- Added __InitTZStrings() for both Linux and macOS to work the same
  way as Windows.
@spevans
Copy link
Contributor Author

spevans commented Nov 27, 2017

@swift-ci please test

@alblue
Copy link
Contributor

alblue commented Nov 28, 2017

@swift-ci please test and merge

@swift-ci swift-ci merged commit 6d6b20c into swiftlang:master Nov 28, 2017
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