diff options
author | Wayne Davison <wayned@samba.org> | 2008-09-01 12:53:43 -0700 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2008-09-01 13:27:11 -0700 |
commit | adc2476fa213797d849ae80fa8b5fcd9eba5dc4f (patch) | |
tree | 6a2ec090dfab190c8583760edafb2828cd7f4944 /testsuite/daemon.test | |
parent | 34c3ca8f35ddd77eb18711d227924d0010520075 (diff) | |
download | rsync-adc2476fa213797d849ae80fa8b5fcd9eba5dc4f.tar.gz |
Output numbers in 3-digit groups by default (e.g. 1,234,567).
Also improved the human-readable output functions, including
adding the ability to output negative numbers.
Diffstat (limited to 'testsuite/daemon.test')
-rw-r--r-- | testsuite/daemon.test | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/testsuite/daemon.test b/testsuite/daemon.test index 113d6a59..2d003530 100644 --- a/testsuite/daemon.test +++ b/testsuite/daemon.test @@ -25,7 +25,8 @@ chkfile="$scratchdir/rsync.chk" outfile="$scratchdir/rsync.out" SSH="src/support/lsh --no-cd" -DIR_REPL='s/^\(d[^ ]*\) *[0-9][0-9]* /\1 DIR /' +FILE_REPL='s/^\([^d][^ ]*\) *\(..........[0-9]\) /\1 \2 /' +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 @@ -65,7 +66,7 @@ EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed" $RSYNC -r localhost::test-hidden \ - | sed "$DIR_REPL" | sed "$LS_REPL" \ + | sed "$FILE_REPL" | sed "$DIR_REPL" | sed "$LS_REPL" \ | tee "$outfile" cat <<EOT >"$chkfile" drwxr-xr-x DIR ####/##/## ##:##:## . @@ -79,7 +80,7 @@ EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed" $RSYNC -r localhost::test-from/f* \ - | sed "$DIR_REPL" | sed "$LS_REPL" \ + | sed "$FILE_REPL" | sed "$DIR_REPL" | sed "$LS_REPL" \ | tee "$outfile" cat <<EOT >"$chkfile" drwxr-xr-x DIR ####/##/## ##:##:## foo |