X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/eddeaf76f8df1344b3918f17ac8e9639b63f94f2..7918f2440534993bdda324da839b2ea9a3884757:/testsuite/rsync.fns diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index 396cee69..eaad40a3 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -18,40 +18,68 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -TMP="$scratchdir" -FROM=${TMP}/from -TO=${TMP}/to -LOG=${TMP}/log -RSYNC="$rsync_bin" +tmpdir="$scratchdir" +fromdir="$tmpdir/from" +todir="$tmpdir/to" +chkdir="$tmpdir/chk" # Berkley's nice. PATH="$PATH:/usr/ucb" -if diff -u $srcdir/testsuite/rsync.fns $srcdir/testsuite/rsync.fns >/dev/null 2>&1; then +if diff -u "$srcdir/testsuite/rsync.fns" "$srcdir/testsuite/rsync.fns" >/dev/null 2>&1; then diffopt="-u" else diffopt="-c" fi +HOME="$scratchdir" +export HOME + runtest() { echo $ECHO_N "Test $1: $ECHO_C" if eval "$2" then - echo "${ECHO_T} done." + echo "$ECHO_T done." return 0 else - echo "${ECHO_T} failed!" + echo "$ECHO_T failed!" return 1 fi } +# Call this if you want to filter out verbose messages (-v or -vv) from +# the output of an rsync run (whittling the output down to just the file +# messages). This isn't needed if you use -i without -v. +filter_outfile() { + sed -e '/^building file list /d' \ + -e '/^sending incremental file list/d' \ + -e '/^created directory /d' \ + -e '/^done$/d' \ + -e '/ --whole-file$/d' \ + -e '/^total: /d' \ + -e '/^client charset: /d' \ + -e '/^server charset: /d' \ + -e '/^$/,$d' \ + <"$outfile" >"$outfile.new" + mv "$outfile.new" "$outfile" +} + printmsg() { echo "$1" } - rsync_ls_lR() { - find "$@" -print | sort | xargs "$TOOLDIR/tls" + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS +} + +check_perms() { + perms=`"$TOOLDIR/tls" "$1" | sed 's/^[-d]\(.........\).*/\1/'` + if test $perms = $2; then + return 0 + fi + echo "permissions: $perms on $1" + echo "should be: $2" + test_fail "failed test $3" } rsync_getgroups() { @@ -60,16 +88,16 @@ rsync_getgroups() { #################### -# Build test directories TO and FROM, with FROM full of files. +# Build test directories $todir and $fromdir, with $fromdir full of files. hands_setup() { # Clean before creation - rm -rf $FROM - rm -rf $TO + rm -rf "$fromdir" + rm -rf "$todir" - [ -d $TMP ] || mkdir $TMP - [ -d $FROM ] || mkdir $FROM - [ -d $TO ] || mkdir $TO + [ -d "$tmpdir" ] || mkdir "$tmpdir" + [ -d "$fromdir" ] || mkdir "$fromdir" + [ -d "$todir" ] || mkdir "$todir" # On some BSD systems, the umask affects the mode of created # symlinks, even though the mode apparently has no effect on how @@ -82,46 +110,54 @@ hands_setup() { # the same. So, we need to set our umask before doing any creations. # set up test data - touch ${FROM}/empty - mkdir ${FROM}/emptydir + touch "$fromdir/empty" + mkdir "$fromdir/emptydir" # a hundred lines of text or so - rsync_ls_lR "${srcdir}" > ${FROM}/filelist + rsync_ls_lR "$srcdir" > "$fromdir/filelist" - # This might fail on systems that don't have -n - echo $ECHO_N "This file has no trailing lf$ECHO_C" > ${FROM}/nolf + echo $ECHO_N "This file has no trailing lf$ECHO_C" > "$fromdir/nolf" umask 0 - ln -s nolf ${FROM}/nolf-symlink + ln -s nolf "$fromdir/nolf-symlink" umask 022 - cat $srcdir/*.c > ${FROM}/text - mkdir ${FROM}/dir - cp ${FROM}/text ${FROM}/dir - mkdir ${FROM}/dir/subdir - mkdir ${FROM}/dir/subdir/subsubdir - ls -ltr /etc > ${FROM}/dir/subdir/subsubdir/etc-ltr-list - mkdir ${FROM}/dir/subdir/subsubdir2 - ls -lt /bin > ${FROM}/dir/subdir/subsubdir2/bin-lt-list + cat "$srcdir"/*.c > "$fromdir/text" + mkdir "$fromdir/dir" + cp "$fromdir/text" "$fromdir/dir" + mkdir "$fromdir/dir/subdir" + echo some data > "$fromdir/dir/subdir/foobar.baz" + mkdir "$fromdir/dir/subdir/subsubdir" + if [ -r /etc ]; then + ls -ltr /etc > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" + else + ls -ltr / > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" + fi + mkdir "$fromdir/dir/subdir/subsubdir2" + if [ -r /bin ]; then + ls -lt /bin > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" + else + ls -lt / > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" + fi # echo testing head: -# ls -lR ${srcdir} | head -10 || echo failed +# ls -lR "$srcdir" | head -10 || echo failed } #################### # Many machines do not have "mkdir -p", so we have to build up long paths. # How boring. -makepath () { - echo " makepath $1" - p="$1" - ( +makepath() { + for p in "${@}"; do + (echo " makepath $p" + # Absolut Unix. if echo $p | grep '^/' >/dev/null then cd / fi - # This will break if $1 contains a space. + # This will break if $p contains a space. for c in `echo $p | tr '/' ' '` do if [ -d "$c" ] || mkdir "$c" @@ -130,8 +166,8 @@ makepath () { else echo "failed to create $c" >&2; return $? fi - done - ) + done) + done } @@ -159,20 +195,23 @@ checkit() { fi echo "-------------" - echo "check how the files compare with diff:" + echo "check how the directory listings compare with diff:" echo "" - for f in `cd "$2"; find . -type f -print ` - do - diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES - done + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" + ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" + diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES echo "-------------" - echo "check how the directory listings compare with diff:" + echo "check how the files compare with diff:" echo "" - ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from - ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to - diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES - if [ -z "${failed}" ] ; then + if [ "x$4" != x ]; then + echo " === Skipping (as directed) ===" + else + diff -r $diffopt "$2" "$3" || failed=YES + fi + + echo "-------------" + if [ -z "$failed" ] ; then return 0 else return 1 @@ -188,33 +227,38 @@ build_rsyncd_conf() { port=2612 pidfile="$scratchdir/rsyncd.pid" logfile="$scratchdir/rsyncd.log" + hostname=`uname -n` - cat >$conf <"$conf" <"$fromdir/referent" ln -s referent "$fromdir/relative" @@ -230,7 +274,7 @@ test_fail() { test_skipped() { echo "$@" >&2 - echo "$@" > "$TMP/whyskipped" + echo "$@" > "$tmpdir/whyskipped" exit 77 }