fix: patch expect tests on macos #11132
Open
+17
−6
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
A recent update to macos's patch command broke some of our tests. The relevant changes to the command's behaviour are that it's stricter about line numbers in patch metadata, and it no longer deletes files, truncating them instead. This updates dune's patch expect tests to accomodate this behaviour. Signed-off-by: Stephen Sherratt <stephen@sherra.tt>
gridbugs
force-pushed
the
fix-patch-expect-tests-on-macos
branch
from
d83725e
to
5fcaec6
Compare
maiste
changed the title
maiste
reviewed
Nov 19, 2024
| match (Unix.stat filename).st_kind with | ||
| | S_REG -> | ||
| (* Some implementations of patch (e.g. the patch that ships with macOS | ||
| 15.1) do not delete files, and instread truncate them to 0 length. If |
There was a problem hiding this comment.
Suggested change
| 15.1) do not delete files, and instread truncate them to 0 length. If | |
| 15.1) do not delete files, and instead truncate them to 0 length. If |
maiste
approved these changes
Nov 19, 2024
Leonidas-from-XIV
requested changes
Nov 19, 2024
| 15.1) do not delete files, and instread truncate them to 0 length. If | ||
| the file still exists after applying the patch, assert that it is now | ||
| empty. *) | ||
| assert (String.length (Io.String_path.read_file filename) == 0) |
There was a problem hiding this comment.
I think instead of reading the file I think it would be better to look at the stat metadata and read st_size. We already stat above and reading the size feels more direct than checking the length of the contents we read.
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.
A recent update to macos's patch command broke some of our tests. The relevant changes to the command's behaviour are that it's stricter about line numbers in patch metadata, and it no longer deletes files, truncating them instead. This updates dune's patch expect tests to accomodate this behaviour.