X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/18d7e9f46ec2ee625bfa18c417e5fd89cdd0621c..87c0f9d6b4899729313154ac5752dd86c745ed07:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index a1902b70..7d73f0c1 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -70,7 +70,13 @@ rsync_ls_lR() {
 }
 
 check_perms() {
-    "$TOOLDIR/tls" "$1" | grep "^-$2" >/dev/null
+    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() { 
@@ -138,7 +144,7 @@ hands_setup() {
 ####################
 # Many machines do not have "mkdir -p", so we have to build up long paths.
 # How boring.  
-makepath () {
+makepath() {
     echo "        makepath $1"
     p="$1"
     (
@@ -226,9 +232,10 @@ pid file = $pidfile
 use chroot = no
 hosts allow = localhost, 127.0.0.1
 log file = $logfile
+log format = %i %h [%a] %m (%u) %l %f%L
+transfer logging = yes
 exclude = foobar.baz
 max verbosity = 9
-
 uid = 0
 gid = 0
 
@@ -239,6 +246,10 @@ gid = 0
 [test-to]
 	path = $todir
 	read only = no
+
+[test-scratch]
+	path = $scratchdir
+	read only = no
 EOF
 }