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).

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 8059814..1ec598d 100644 (file)
--- 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