X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3060ca8d422dd40e497ba09c0cf5be021ed585e3..164faae84f0abf1c9df2f28a09ae8579c86acfa3:/testsuite/default-acls.test

diff --git a/testsuite/default-acls.test b/testsuite/default-acls.test
index 38ed2b79..eb41a6ff 100644
--- a/testsuite/default-acls.test
+++ b/testsuite/default-acls.test
@@ -5,14 +5,10 @@
 
 # Test that rsync obeys default ACLs. -- Matt McCutchen
 
-. $srcdir/testsuite/rsync.fns
+. $suitedir/rsync.fns
 
 $RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
 
-case "$RSYNC" in
-*protocol=29*) test_skipped "ACLs require protocol 30" ;;
-esac
-
 case "$setfacl_nodef" in
 true) test_skipped "I don't know how to use your setfacl command" ;;
 *-k*) opts='-dm u::7,g::5,o:5' ;;
@@ -20,8 +16,6 @@ true) test_skipped "I don't know how to use your setfacl command" ;;
 esac
 setfacl $opts "$scratchdir" || test_skipped "Your filesystem has ACLs disabled"
 
-test_skipped "Skipping temporarily due to compile-farm timeouts"
-
 # Call as: testit <dirname> <default-acl> <file-expected> <program-expected>
 testit() {
     todir="$scratchdir/$1"
@@ -61,7 +55,7 @@ umask 0077
 testit da777 u::7,g::7,o:7 rw-rw-rw- rwxrwxrwx
 testit da775 u::7,g::7,o:5 rw-rw-r-- rwxrwxr-x
 testit da750 u::7,g::5,o:0 rw-r----- rwxr-x---
-testit da770mask u::7,u:0:7,g::0,m:7,o:0 rw-rw---- rwxrwx---
+testit da750mask u::7,u:0:7,g::7,m:5,o:0 rw-r----- rwxr-x---
 testit noda1 '' rw------- rwx------
 umask 0000
 testit noda2 '' rw-rw-rw- rwxrwxrwx