[BACK]Return to daemon.test CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync / testsuite

Diff for /embedaddon/rsync/testsuite/daemon.test between versions 1.1 and 1.1.1.3

version 1.1, 2012/02/17 15:09:30 version 1.1.1.3, 2021/03/17 00:32:36
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] ;####/##/## ##:##:## ;g'
   
 build_rsyncd_conf  build_rsyncd_conf
   
Line 41  cd "$scratchdir" Line 41  cd "$scratchdir"
   
 ln -s test-rsyncd.conf rsyncd.conf  ln -s test-rsyncd.conf rsyncd.conf
   
   my_uid=`get_testuid`
   root_uid=`get_rootuid`
 confopt=''  confopt=''
case `get_testuid` inif test x"$my_uid" = x"$root_uid"; then
0) 
     # Root needs to specify the config file, or it uses /etc/rsyncd.conf.      # Root needs to specify the config file, or it uses /etc/rsyncd.conf.
     echo "Forcing --config=$conf"      echo "Forcing --config=$conf"
     confopt=" --config=$conf"      confopt=" --config=$conf"
    ;;fi
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 \
Line 88  drwxr-xr-x         DIR ####/##/## ##:##:## foo Line 91  drwxr-xr-x         DIR ####/##/## ##:##:## foo
 EOT  EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"  diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
   
   if $RSYNC --version | grep "[, ] atimes" >/dev/null; then
       $RSYNC -rU localhost::test-from/f* \
           | sed "$FILE_REPL" | sed "$DIR_REPL" | sed "$LS_REPL" \
           | tee "$outfile"
       cat <<EOT >"$chkfile"
   drwxr-xr-x         DIR ####/##/## ##:##:##                     foo
   -rw-r--r--           4 ####/##/## ##:##:## ####/##/## ##:##:## foo/one
   EOT
       diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
   fi
Removed from v.1.1  
changed lines
  Added in v.1.1.1.3

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