Modified to recognize FreeBSD's setfacl command.
authorWayne Davison <wayned@samba.org>
Sat, 4 Nov 2006 00:18:49 +0000 (00:18 +0000)
committerWayne Davison <wayned@samba.org>
Sat, 4 Nov 2006 00:18:49 +0000 (00:18 +0000)
runtests.sh

index 005c22a22087e8dbfa5221e426e45e0766f12472..3750b03923259c6b2b5a2320f0d01686f913a109 100755 (executable)
@@ -182,7 +182,7 @@ else
 fi    
 
 # 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
+if 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'
@@ -221,7 +221,7 @@ prep_scratch() {
     [ -d "$scratchdir" ] && rm -rf "$scratchdir"
     mkdir "$scratchdir"
     # Get rid of default ACLs and dir-setgid to avoid confusing some tests.
-    $setfacl_nodef "$scratchdir"
+    $setfacl_nodef "$scratchdir" || true
     chmod g-s "$scratchdir"
     return 0
 }