X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0480a946f50c19ddcaea170c8f5aec68ecfbc1d2..524eaa8245e3d9314055759403ead1fee9e136cc:/testsuite/chmod-option.test

diff --git a/testsuite/chmod-option.test b/testsuite/chmod-option.test
index 9278fa57..3e5fd285 100644
--- a/testsuite/chmod-option.test
+++ b/testsuite/chmod-option.test
@@ -39,14 +39,13 @@ chmod +w "$checkdir" "$checkdir"/dir*
 checkit "$RSYNC -avv --chmod ug-s,a+rX,D+w \"$fromdir/\" \"$todir/\"" "$checkdir" "$todir"
 
 rm -r "$fromdir" "$checkdir" "$todir"
-makepath "$todir"
-makepath "$fromdir/foo"
+makepath "$todir" "$fromdir/foo"
 touch "$fromdir/bar"
 
 checkit "$RSYNC -avv \"$fromdir/\" \"$checkdir/\"" "$fromdir" "$checkdir"
-chmod +t "$checkdir"/bar
+chmod o+x "$fromdir"/bar
 
-checkit "$RSYNC -avv --chmod=F+t \"$fromdir/\" \"$todir/\"" "$checkdir" "$todir"
+checkit "$RSYNC -avv --chmod=Fo-x \"$fromdir/\" \"$todir/\"" "$checkdir" "$todir"
 
 # Tickle a bug in rsync 2.6.8: if you push a new directory with --perms off to
 # a daemon with an incoming chmod, the daemon pretends the directory is a file
@@ -57,7 +56,7 @@ cat >>"$scratchdir/test-rsyncd.conf" <<EOF
 [test-incoming-chmod]
 	path = $todir
 	read only = no
-	incoming chmod = F+t
+	incoming chmod = Fo-x
 EOF
 
 RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
@@ -66,7 +65,7 @@ export RSYNC_CONNECT_PROG
 rm -r "$todir"
 makepath "$todir"
 
-checkit "$RSYNC -rtvv \"$fromdir/\" localhost::test-incoming-chmod/" "$checkdir" "$todir"
+checkit "$RSYNC -avv --no-perms \"$fromdir/\" localhost::test-incoming-chmod/" "$checkdir" "$todir"
 
 # The script would have aborted on error, so getting here means we've won.
 exit 0