diff options
| author | Wayne Davison <wayned@samba.org> | 2007-03-12 04:56:15 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2007-03-12 04:56:15 +0000 |
| commit | 91763a9c2f9b0c64e9bbabdf0619faa279317283 (patch) | |
| tree | b5baae75aa8f5950ca6a9a2b33ccf3261b2c4037 /testsuite/merge.test | |
| parent | 18438f0bac84a084cbec8f6960476ea434dea0ea (diff) | |
| download | rsync-91763a9c2f9b0c64e9bbabdf0619faa279317283.tar.gz | |
It looks like some of the compile-farm hosts are hanging on this test,
so let's try some remote-diagnostics (let's try protocol 29 first).
Diffstat (limited to 'testsuite/merge.test')
| -rw-r--r-- | testsuite/merge.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/merge.test b/testsuite/merge.test index 80598149..1ec598d1 100644 --- a/testsuite/merge.test +++ b/testsuite/merge.test @@ -41,12 +41,12 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/ cp -p "$from3dir"/sub2/subby "$chkdir"/sub2 # Get rid of any directory-time differences -$RSYNC -av --existing -f 'exclude,! */' "$from1dir/" "$from2dir/" -$RSYNC -av --existing -f 'exclude,! */' "$from2dir/" "$from3dir/" -$RSYNC -av --existing -f 'exclude,! */' "$from1dir/" "$chkdir/" -$RSYNC -av --existing -f 'exclude,! */' "$from3dir/" "$chkdir/" +$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from1dir/" "$from2dir/" +$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from2dir/" "$from3dir/" +$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from1dir/" "$chkdir/" +$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from3dir/" "$chkdir/" -checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir" +checkit "$RSYNC -aHvv --protocol=29 \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir" # The script would have aborted on error, so getting here means we've won. exit 0 |