tests/truncate: add regression tests for -s %SIZE round-up bug#10901
Merged
ChrisDryden merged 1 commit intouutils:mainfrom Feb 14, 2026
Merged
tests/truncate: add regression tests for -s %SIZE round-up bug#10901ChrisDryden merged 1 commit intouutils:mainfrom
ChrisDryden merged 1 commit intouutils:mainfrom
Conversation
|
GNU testsuite comparison: |
Contributor
Author
|
I am not expert with coreutils' CI ; but checking some others, it seems to be 2 scenarios that are used to fail ; I do not see how they are related to this commit. The purpose of this contribution is to avoid other regressions that lead to wrong sizes. |
ChrisDryden
reviewed
Feb 13, 2026
tests/by-util/test_truncate.rs
Outdated
|
|
||
| /// Regression test: round up when file is smaller than the rounding unit. | ||
| /// | ||
| /// `truncate -s %4K` on a 10-byte file must produce 4096 bytes, not 20. |
Collaborator
There was a problem hiding this comment.
More of a style nit and personal preference but do you think it would be possible to make the test names descriptive enough to not require the comment above to make it more consise? Same with the additional code of "expected '{expected}' got '{actual}'" I think if it fails it will provide the left and right descriptions
Collaborator
|
Thanks for adding more test cases, always good to have even if the underlying issue was already fixed. The tests seem correct to me just was hoping that we could reduce the size a bit |
Contributor
Author
|
@ChrisDryden : this issue/ regression had been critical for ATF, so the purpose is to harden with the related use case thru those tests. I'll check about your comments on cosmetics. |
The old RoundUp formula `fsize + fsize % size` was incorrect. For example, `truncate -s %128K` on a 24696-byte file produced 49392 bytes instead of the correct 131072 bytes. This was incidentally fixed in commit fe97933 ("truncate: eliminate duplicate stat() syscall") by replacing the formula with `fsize.checked_next_multiple_of(size)`. However, the existing test `test_round_up` used values (fsize=10, size=4) where both the buggy and correct formulas give the same result (12), so the bug was never caught by the test suite. Add unit and integration tests that would have caught this bug: - File smaller than rounding unit (the reported scenario) - File larger than rounding unit but not aligned - File already aligned to the rounding unit - Division by zero (RoundUp with size=0) Link: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/48210 Signed-off-by: Vincent Jardin <vjardin@free.fr>
vjardin
force-pushed
the
vj_fixtruncatev1
branch
from
d661faf to
31f52d7
Compare
Contributor
Author
|
@ChrisDryden : done, feel free to comment if you want some more adjustments. |
|
GNU testsuite comparison: |
abendrothj
pushed a commit
to abendrothj/coreutils
that referenced
this pull request
Feb 17, 2026
…s#10901) The old RoundUp formula `fsize + fsize % size` was incorrect. For example, `truncate -s %128K` on a 24696-byte file produced 49392 bytes instead of the correct 131072 bytes. This was incidentally fixed in commit fe97933 ("truncate: eliminate duplicate stat() syscall") by replacing the formula with `fsize.checked_next_multiple_of(size)`. However, the existing test `test_round_up` used values (fsize=10, size=4) where both the buggy and correct formulas give the same result (12), so the bug was never caught by the test suite. Add unit and integration tests that would have caught this bug: - File smaller than rounding unit (the reported scenario) - File larger than rounding unit but not aligned - File already aligned to the rounding unit - Division by zero (RoundUp with size=0) Link: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/48210 Signed-off-by: Vincent Jardin <vjardin@free.fr>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 old RoundUp formula
fsize + fsize % sizewas incorrect. For example,truncate -s %128Kon a 24696-byte file produced 49392 bytes instead of the correct 131072 bytes.Maybe, this was incidentally fixed in commit fe97933 ("truncate: eliminate duplicate stat() syscall") by replacing the formula with
fsize.checked_next_multiple_of(size). However, the existing testtest_round_upused values (fsize=10, size=4) where both the buggy and correct formulas give the same result (12), so the bug was never caught by the test suite.Add unit and integration tests that would have caught this bug:
Link: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/48210