Diff for /embedaddon/rsync/testsuite/daemon.test between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/17 15:09:30 version 1.1.1.2, 2013/10/14 07:51:15
Line 24 Line 24
 chkfile="$scratchdir/rsync.chk"  chkfile="$scratchdir/rsync.chk"
 outfile="$scratchdir/rsync.out"  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 /'  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];####/##/## ##:##:##;'  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  build_rsyncd_conf
Line 50  case `get_testuid` in Line 50  case `get_testuid` in
     ;;      ;;
 esac  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.  # These have a space-padded 15-char name, then a tab, then a comment.
 sed 's/NOCOMMENT//' <<EOT >"$chkfile"  sed 's/NOCOMMENT//' <<EOT >"$chkfile"
 test-from       r/o  test-from       r/o
 test-to         r/w  test-to         r/w
 test-scratch    NOCOMMENT  test-scratch    NOCOMMENT
 EOT  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"  diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
   
 $RSYNC -r localhost::test-hidden \  $RSYNC -r localhost::test-hidden \

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>