X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a5df33bb62e177ef40c84776f2ad08542c396e85..5b51c893c563e64f1e6b7e0550f4b8831e641bd1:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 9f0ce85a..558d986c 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -85,7 +85,7 @@
 # they're explicitly given on the command line.
 
 # Also, we can't count on 'cp -a' or 'mkdir -p', although they're
-# pretty handy.
+# pretty handy (see function makepath for the latter).
 
 # I think some of the GNU documentation suggests that we shouldn't
 # rely on shell functions.  However, the Bash manual seems to say that
@@ -100,6 +100,8 @@
 # You cannot do "export VAR=VALUE" all on one line; the export must be
 # separate from the assignment.  (SCO SysV)
 
+# Don't rely on grep -q, as that doesn't work everywhere -- just redirect
+# stdout to /dev/null to keep it quiet.
 
 
 # STILL TO DO:
@@ -161,8 +163,8 @@ else
     echo "    preserve_scratch=no"
 fi    
 
-# We'll use setfacl if it's around.
-if test -f /usr/bin/setfacl || setfacl --help >/dev/null 2>&1 ; then
+# 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