X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/13d00101e808ebfc327f8c5e830b96303facf31f..00f00f846b20b4d6bc0eee2668b0c50fd4531a48:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index c4c4137f..f6d86f7f 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -124,6 +124,7 @@ set -e
 . "./shconfig"
 
 RUNSHFLAGS='-e'
+export RUNSHFLAGS
 
 # for Solaris
 [ -d /usr/xpg4/bin ] && PATH="/usr/xpg4/bin/:$PATH"
@@ -160,6 +161,12 @@ else
     echo "    preserve_scratch=no"
 fi    
 
+# We'll use setfacl if it's around and it supports the -k option.
+if setfacl --help 2>/dev/null | grep ' -k,' >/dev/null; then
+    setfacl=setfacl
+else
+    setfacl=true
+fi
 
 if [ ! -f "$rsync_bin" ]; then
     echo "rsync_bin $rsync_bin is not a file" >&2
@@ -194,6 +201,9 @@ export scratchdir suitedir
 prep_scratch() {
     [ -d "$scratchdir" ] && rm -rf "$scratchdir"
     mkdir "$scratchdir"
+    # Get rid of default ACLs and dir-setgid to avoid confusing some tests.
+    $setfacl -k "$scratchdir"
+    chmod g-s "$scratchdir"
     return 0
 }