A few more --files-from fixes, and an enhanced testsuite for it.

[rsync/rsync.git] / testsuite / files-from.test

diff --git a/testsuite/files-from.test b/testsuite/files-from.test
index ea20202..6cc315b 100644 (file)
--- a/testsuite/files-from.test
+++ b/testsuite/files-from.test
@@ -9,6 +9,8 @@
 
 . "$suitedir/rsync.fns"
 
+SSH="$scratchdir/src/support/lsh"
+
 hands_setup
 
 # This list of files skips the contents of "subsubdir" but includes
@@ -26,5 +28,18 @@ $RSYNC -a --exclude=dir/text --exclude='subsubdir/**' "$fromdir/" "$chkdir/"
 
 checkit "$RSYNC -av --files-from='$scratchdir/filelist' '$scratchdir' '$todir/'" "$chkdir" "$todir"
 
+for filehost in '' 'localhost:'; do
+    for srchost in '' 'localhost:'; do
+       if [ -z "$srchost" ]; then
+           desthost='localhost:'
+       else
+           desthost=''
+       fi
+
+       rm -rf "$todir"
+       checkit "$RSYNC -avse '$SSH' --rsync-path='$RSYNC' --files-from='$filehost$scratchdir/filelist' '$srchost$scratchdir' '$desthost$todir/'" "$chkdir" "$todir"
+    done
+done
+
 # The script would have aborted on error, so getting here means we've won.
 exit 0