Simple test to validate -H break reported in #702#703
Merged
tridge merged 1 commit intoRsyncProject:masterfrom Jan 15, 2025
Merged
Simple test to validate -H break reported in #702#703tridge merged 1 commit intoRsyncProject:masterfrom
tridge merged 1 commit intoRsyncProject:masterfrom
Conversation
Contributor
|
The test appears to fail also on v3.3.0: |
ncopa
reviewed
Jan 15, 2025
testsuite/preserve-symlink.test
Outdated
|
|
||
| . "$suitedir/rsync.fns" | ||
|
|
||
| makepath "$fromdir/sym" "$todir" |
Contributor
There was a problem hiding this comment.
Suggested change
| makepath "$fromdir/sym" "$todir" | |
| makepath "$fromdir/sym" "$todir" "$fromdir" "$todir" |
Contributor
|
I think the name of this test is misleading. Maybe the test could be added to |
Contributor
Author
|
Move the test inside hardlink.test, but I can't easily test under FreeBSD, popt has to be first unbroken. |
Contributor
|
It correctly triggers the error: https://github.com/RsyncProject/rsync/actions/runs/12791679571/job/35660352351?pr=703#step:8:4163 But does not pass with the fix: |
Contributor
|
Try this: diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test
index 7e5219d3..299be24e 100644
--- a/testsuite/hardlinks.test
+++ b/testsuite/hardlinks.test
@@ -79,8 +79,9 @@ diff $diffopt "$name1" "$todir" || test_fail "solo copy of name1 failed"
# Make sure there's nothing wrong with sending a single directory with -H
# enabled (this has broken in 3.4.0 so far, so we need this test).
-makepath "$fromdir/sym" "$todir" "$fromdir" "$todir"
-checkit "$RSYNC -aH '$fromdir/sym' '$todir'"
+rm -rf "$fromdir" "$todir"
+makepath "$fromdir/sym" "$todir"
+checkit "$RSYNC -aH '$fromdir/sym' '$todir'" "$fromdir" "$todir"
# The script would have aborted on error, so getting here means we've won.
exit 0 |
Contributor
|
Works! 👍 |
Ensure this still working after 3.4.0 breakage RsyncProject#702
Member
|
rebased this PR after the fix from @ncopa |
tridge
approved these changes
Jan 15, 2025
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
3 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.
#702