[android] Fix symlink comparison in Android. #2433
Merged
Conversation
This file contains 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
The size reported by stat.st_size might not be the size of the contents of the symlink, since it might include metadata. In Android at least the size of a symlink seems to start at 18 bytes, even if the contents are smaller. The commit disables the st_size comparison against the contents comparison for Android, and rewrites a little the function to use Swift constructs like defer and guards.
|
@swift-ci test |
|
@swift-ci test linux |
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.
The size reported by stat.st_size might not be the size of the contents
of the symlink, since it might include metadata. In Android at least the
size of a symlink seems to start at 18 bytes, even if the contents are
smaller.
The commit disables the st_size comparison against the contents
comparison for Android, and rewrites a little the function to use Swift
constructs like defer and guards.
This fixes
TestFileManager.test_contentsEqualin Android.PD: I don't know if the check is correct in many other file systems, but I don't think the test should be done at all. I only disabled it for Android because it is the only system where the symlinks doesn't seem to follow the pattern.