--- embedaddon/rsync/testsuite/daemon.test	2012/02/17 15:09:30	1.1.1.1
+++ embedaddon/rsync/testsuite/daemon.test	2013/10/14 07:51:15	1.1.1.2
@@ -24,9 +24,9 @@
 chkfile="$scratchdir/rsync.chk"
 outfile="$scratchdir/rsync.out"
 
-SSH="src/support/lsh --no-cd"
+SSH="src/support/lsh.sh --no-cd"
 FILE_REPL='s/^\([^d][^ ]*\) *\(..........[0-9]\) /\1 \2 /'
-DIR_REPL='s/^\(d[^ ]*\)  *[0-9][0-9]* /\1         DIR /'
+DIR_REPL='s/^\(d[^ ]*\)  *[0-9][.,0-9]* /\1         DIR /'
 LS_REPL='s;[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9];####/##/## ##:##:##;'
 
 build_rsyncd_conf
@@ -50,19 +50,22 @@ case `get_testuid` in
     ;;
 esac
 
-$RSYNC -ve "$SSH" --rsync-path="$RSYNC$confopt" localhost::
-
-RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
-export RSYNC_CONNECT_PROG
-
-$RSYNC -v localhost:: \
-    | tee "$outfile"
 # These have a space-padded 15-char name, then a tab, then a comment.
 sed 's/NOCOMMENT//' <<EOT >"$chkfile"
 test-from      	r/o
 test-to        	r/w
 test-scratch   	NOCOMMENT
 EOT
+
+$RSYNC -ve "$SSH" --rsync-path="$RSYNC$confopt" localhost:: | tee "$outfile"
+echo '===='
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 0 failed"
+
+RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
+export RSYNC_CONNECT_PROG
+
+$RSYNC -v localhost:: | tee "$outfile"
+echo '===='
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
 
 $RSYNC -r localhost::test-hidden \