X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c395acd8046a0dc8be3df095ce7c1e9fbf48864b..27999abab48979c7306a1c335f8e264c6c200457:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 286f0c5d..c401ac45 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -181,12 +181,15 @@ else
     echo "    preserve_scratch=no"
 fi    
 
-# Check if setfacl is around and if it supports the -k or -s option.
-if setfacl --help 2>&1 | grep ' -k,\|\[-[a-z]*k' >/dev/null; then
+# Check if setacl/setfacl is around and if it supports the -k or -s option.
+if setacl -k u::7,g::5,o:5 testsuite 2>/dev/null; then
+    setfacl_nodef='setacl -k'
+elif setfacl --help 2>&1 | grep ' -k,\|\[-[a-z]*k' >/dev/null; then
     setfacl_nodef='setfacl -k'
 elif setfacl -s u::7,g::5,o:5 testsuite 2>/dev/null; then
     setfacl_nodef='setfacl -s u::7,g::5,o:5'
 else
+    # The "true" command runs successfully, but does nothing.
     setfacl_nodef=true
 fi
 
@@ -221,7 +224,7 @@ suitedir="$srcdir/testsuite"
 export scratchdir suitedir
 
 prep_scratch() {
-    [ -d "$scratchdir" ] && rm -rf "$scratchdir"
+    [ -d "$scratchdir" ] && chmod -R u+rwX "$scratchdir" && rm -rf "$scratchdir"
     mkdir "$scratchdir"
     # Get rid of default ACLs and dir-setgid to avoid confusing some tests.
     $setfacl_nodef "$scratchdir" || true