X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=68ae769104826e0e9c759900e116d7d8765e7b32;hb=cd03e4e2f8afdbd2c9d70cb9b9e2ca7db07e826e;hp=7b445502ea910a08e54bc4c84d146b9274e6a6b6;hpb=c03a7e0eed0349bbffdea2663aae846483e4c3f6;p=apply-default-acl.git

diff --git a/run-tests.sh b/run-tests.sh
index 7b44550..68ae769 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 
 # The program name.
-BIN=./reapply_default_acl
+BIN=./src/apply-default-acl
 
 # The directory where we'll do all the ACL manipulation.
 TESTDIR=test
 
 acl_reset() {
     # Remove any ACLs on our test directory and remove its contents.
-    setfacl --remove-all --recursive "$TESTDIR"
+    setfacl --remove-all --recursive "${TESTDIR}"
+    chmod 755 "${TESTDIR}"
     rm -rf "${TESTDIR}"/*
 }
 
@@ -18,10 +19,14 @@ compare() {
 	acl_reset
     else
 	echo "Failure (#${TESTNUM})"
-	echo "Expected result:"
+	echo 'Expected result:'
+	echo '================'
 	echo "${EXPECTED}"
-	echo "Actual result:"
+	echo '================'
+	echo 'Actual result:'
+	echo '================'
 	echo "${ACTUAL}"
+	echo '================'
 	exit 1
     fi
 }
@@ -334,3 +339,61 @@ EOF
 
 ACTUAL=`getfacl --omit-header "${TARGET}"/bar`
 compare
+
+
+# Test double application on a directory.
+#
+TESTNUM=14
+TARGET="${TESTDIR}"/baz
+mkdir "${TARGET}"
+chmod 644 "${TARGET}"
+setfacl -d -m user:mail:rwx "${TESTDIR}"
+
+$BIN "${TARGET}"
+$BIN "${TARGET}"
+
+EXPECTED=$(cat <<EOF
+user::rwx
+user:mail:rwx
+group::r-x
+mask::rwx
+other::r-x
+default:user::rwx
+default:user:mail:rwx
+default:group::r-x
+default:mask::rwx
+default:other::r-x
+EOF
+)
+
+ACTUAL=`getfacl --omit-header "${TARGET}"`
+compare
+
+
+# Same as test #14, with 755 initial perms.
+#
+TESTNUM=15
+TARGET="${TESTDIR}"/baz
+mkdir "${TARGET}"
+chmod 755 "${TARGET}"
+setfacl -d -m user:mail:rwx "${TESTDIR}"
+
+$BIN "${TARGET}"
+$BIN "${TARGET}"
+
+EXPECTED=$(cat <<EOF
+user::rwx
+user:mail:rwx
+group::r-x
+mask::rwx
+other::r-x
+default:user::rwx
+default:user:mail:rwx
+default:group::r-x
+default:mask::rwx
+default:other::r-x
+EOF
+)
+
+ACTUAL=`getfacl --omit-header "${TARGET}"`
+compare