X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/57835c00ad83d218d12dc6c777c5d9f66b926d3f..dfef3f1099468a3b57f69840002184c527259558:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 7508ce8e..e7f753a9 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -24,6 +24,9 @@ TO=${TMP}/to
 LOG=${TMP}/log
 RSYNC="$rsync_bin"
 
+# Berkley's nice.
+PATH="$PATH:/usr/ucb"
+
 runtest() {
     echo $ECHO_N "Test $1: $ECHO_C"
     if eval "$2"
@@ -41,8 +44,12 @@ printmsg() {
 }
 
 
-rsync_ls_lR {
-    find "$@" -print | sort | xargs $TLS
+rsync_ls_lR() {
+    find "$@" -print | sort | xargs "$TOOLDIR/tls"
+}
+
+rsync_getgroups() { 
+    "$TOOLDIR/getgroups"
 }
 
 
@@ -53,7 +60,8 @@ hands_setup() {
     # Clean before creation
     rm -rf $FROM
     rm -rf $TO
-    
+
+    [ -d $TMP ] || mkdir $TMP
     [ -d $FROM ] || mkdir $FROM
     [ -d $TO ] || mkdir $TO
 
@@ -72,7 +80,7 @@ hands_setup() {
     mkdir ${FROM}/emptydir
 
     # a hundred lines of text or so
-    rsync_ls_lR ${srcdir} > ${FROM}/filelist
+    rsync_ls_lR "${srcdir}" > ${FROM}/filelist
 
     # This might fail on systems that don't have -n
     echo $ECHO_N "This file has no trailing lf$ECHO_C" > ${FROM}/nolf
@@ -94,12 +102,18 @@ hands_setup() {
 }
 
 
+hands_cleanup() {
+    rm -r "$TMP"
+}
+
+
 
 
 ####################
 # Many machines do not have "mkdir -p", so we have to build up long paths.
 # How boring.  
 makepath () {
+    echo "        makepath $1"
     p="$1"
     (
 	# Absolut Unix.
@@ -111,8 +125,12 @@ makepath () {
 	# This will break if $1 contains a space.
 	for c in `echo $p | tr '/' ' '`
 	do 
-	    [ -d "$c" ] || mkdir "$c" || return $? 
-	    cd "$c" || return $?
+	    if [ -d "$c" ] || mkdir "$c" 
+	    then
+		cd "$c" || return $?
+	    else
+		echo "failed to create $c" >&2; return $?
+	    fi
 	done
     )
 }
@@ -123,36 +141,41 @@ makepath () {
 # Run a test (in '$1') then compare directories $2 and $3 to see if
 # there are any difference.  If there are, explain them.
 
+# So normally basically $1 should be an rsync command, and $2 and $3
+# the source and destination directories.  This is only good when you
+# expect to transfer the whole directory exactly as is.  If some files
+# should be excluded, you might need to use something else.
+
 checkit() {
-    log=${LOG}
     failed=
-    # the log accumulates all output; we only display it if there 
-    # is a problem.
 
-    echo "Running: \"$1\""  >${log}
-    echo "">>${log}
-    eval "$1"  >>${log} 2>&1
+    # We can just write everything to stdout/stderr, because the
+    # wrapper hides it unless there is a problem.
+
+    echo "Running: \"$1\""  
+    eval "$1" 
     status=$?
     if [ $status != 0 ]; then
 	failed="YES";
     fi
 
-    echo "-------------">>${log}
-    echo "check how the files compare with diff:">>${log}
-    echo "">>${log}
-    diff -cr $2 $3 >>${log} 2>&1 || failed=YES
-    echo "-------------">>${log}
-    echo "check how the directory listings compare with diff:">>${log}
-    echo "">>${log}
-    ( rsync_ls_lR "$2" ) > ${TMP}/ls-from 2>>${log}
-    ( rsync_ls_lR "$3" ) > ${TMP}/ls-to  2>>${log}
-    diff -c ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES
+    echo "-------------"
+    echo "check how the files compare with diff:"
+    echo ""
+    for f in `cd "$2"; find . -type f -print `
+    do 
+        diff -c "$2"/"$f" "$3"/"$f" || failed=YES
+    done
+
+    echo "-------------"
+    echo "check how the directory listings compare with diff:"
+    echo ""
+    ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from 
+    ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to 
+    diff -c ${TMP}/ls-from ${TMP}/ls-to || failed=YES
     if [ -z "${failed}" ] ; then
-	rm $log
 	return 0
     else
-	cat ${log}
-	rm ${log}
 	return 1
     fi
 }
@@ -190,12 +213,63 @@ use chroot = no
 hosts allow = localhost, 127.0.0.1
 log file = $logfile
 
-[test-from] = $scratchdir/daemon-from/
+# We don't know if this machine has "nobody" or "nogroup", so use the quasi-canonical
+# values of (uint16_t) -2. 
+
+uid = 65534
+gid = 65534
+
+[test-from]
+	path = $FROM
 	read only = yes
 
-[test-to] = $scratchdir/daemon-to/
+[test-to]
+	path = $TO
 	read only = no
 EOF
 }
 
 
+build_symlinks() {
+    fromdir="$scratchdir/from"
+    todir="$scratchdir/to"
+    mkdir "$fromdir"
+    date >"$fromdir/referent"
+    ln -s referent "$fromdir/relative"
+    ln -s "$fromdir/referent" "$fromdir/absolute"
+    ln -s nonexistent "$fromdir/dangling"
+    ln -s "$srcdir/rsync.c" "$fromdir/unsafe"
+}
+
+test_fail() {
+    echo "$@" >&2
+    exit 1
+}
+
+test_skipped() {
+    echo "$@" >&2
+    echo "$@" > "$TMP/whyskipped"
+    exit 77
+}
+
+# It failed, but we expected that.  don't dump out error logs, 
+# because most users won't want to see them.  But do leave
+# the working directory around.
+test_xfail() {
+    echo "$@" >&2
+    exit 78
+}
+
+# Test whether something is a link, allowing for shell peculiarities
+is_a_link() {
+    test -L "$1" || test -h "$1" || /usr/bin/test -L "$1" || /usr/bin/test -h "$1"
+}
+
+
+# We need to set the umask to be reproducible.  Note also that when we
+# do some daemon tests as root, we will setuid() and therefore the
+# directory has to be writable by the nobody user in some cases.  The
+# best thing is probably to explicitly chmod those directories after
+# creation.
+ 
+umask 022
\ No newline at end of file