X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c53b6fd0ac7f0364fc454bc19647aa5b843d7848..ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 558d986c..bb8d98cd 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+# Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version
@@ -13,8 +14,7 @@
 # 
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 # rsync top-level test script -- this invokes all the other more
 # detailed tests in order.  This script can either be called by `make
@@ -163,11 +163,13 @@ else
     echo "    preserve_scratch=no"
 fi    
 
-# We'll use setfacl if it's around and it supports the -k option.
+# Check if setfacl is around and if it supports the -k or -s option.
 if setfacl --help 2>/dev/null | grep ' -k,' >/dev/null; then
-    setfacl=setfacl
+    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
-    setfacl=true
+    setfacl_nodef=true
 fi
 
 if [ ! -f "$rsync_bin" ]; then
@@ -183,7 +185,7 @@ fi
 RSYNC="$rsync_bin"
 #RSYNC="valgrind --tool=addrcheck $rsync_bin"
 
-export rsync_bin RSYNC
+export rsync_bin RSYNC setfacl_nodef
 
 skipped=0
 missing=0
@@ -204,7 +206,7 @@ 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"
+    $setfacl_nodef "$scratchdir"
     chmod g-s "$scratchdir"
     return 0
 }