Skip to content
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

[5.1 4/24] Update “unable to load standard library” test (#23990) #24735

Conversation

Projects
None yet
2 participants
@brentdax
Copy link
Collaborator

commented May 13, 2019

Cherry-picks #23990 to swift-5.1-branch-04-24-2019.

One of the subtests of Misc/fatal_error.swift assumes that Swift.swiftmodule is located purely based on the resource directory. It can now also be located in the SDK, so the test needs to be updated. Fixes rdar://problem/49665477.

Original reviewed by @jrose-apple.


This PR modifies one test to handle cases where content could be located in the SDK. It is also compatible with cases where the content is not in the SDK, and has passed in internal-master for nearly a month now. It doesn't change any shipping software at all.

Update “unable to load standard library” test (#23990)
One of the subtests of Misc/fatal_error.swift assumes that Swift.swiftmodule is located purely based on the resource directory. It can now also be located in the SDK, so the test needs to be updated. Fixes <rdar://problem/49665477>.
# Conflicts:
#	test/Misc/fatal_error.swift

@brentdax brentdax requested a review from apple/swift5-branch-managers as a code owner May 13, 2019

@brentdax

This comment has been minimized.

Copy link
Collaborator Author

commented May 13, 2019

@swift-ci please test

@brentdax

This comment has been minimized.

Copy link
Collaborator Author

commented May 13, 2019

This looks almost certain to pass and we'd really like the change to be in, so I'm going to merge it a little early.

@brentdax brentdax merged commit 052bd82 into apple:swift-5.1-branch-04-24-2019 May 13, 2019

2 of 3 checks passed

Swift Test OS X Platform Build started.
Details
Swift Test Linux Platform No test results found.
Details
Swift Test Linux Platform (smoke test)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.