X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=68b3b80907b125602ac8d468a373656a7ceec011;hb=2713726701c897b449d06aca5d7dc22c0b43e653;hp=07ad496584faa680cde5992e2fde03dee698e628;hpb=20baeb9ea1419fd13ca1e76a33d1bb65a73f9e7e;p=apply-default-acl.git

diff --git a/run-tests.sh b/run-tests.sh
index 07ad496..68b3b80 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -219,7 +219,6 @@ setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 setfacl -d -m user:${USERS[1]}:rwx "${TESTDIR}"
 $BIN "${TARGET}"
 
-
 EXPECTED=$(cat <<EOF
 user::rwx
 user:${USERS[0]}:rwx
@@ -243,7 +242,6 @@ setfacl -m user:${USERS[1]}:rw "${TARGET}"
 setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 $BIN "${TARGET}"
 
-
 EXPECTED=$(cat <<EOF
 user::rw-
 user:${USERS[0]}:rwx	#effective:rw-
@@ -672,14 +670,12 @@ compare
 # we get the expected error.
 TESTNUM=25
 ACTUAL=$( "${BIN}" test/nonexistent 2>&1 )
-ACTUAL="${ACTUAL#*: }"
 EXPECTED="test/nonexistent: No such file or directory"
 compare
 
 # Same as the previous test, but with --recursive.
 TESTNUM=26
 ACTUAL=$( "${BIN}" --recursive test/nonexistent 2>&1 )
-ACTUAL="${ACTUAL#*: }"
 EXPECTED="test/nonexistent: No such file or directory"
 compare
 
@@ -690,7 +686,6 @@ DUMMY1="${TESTDIR}/dummy1"
 DUMMY2="${TESTDIR}/dummy2"
 touch "${DUMMY1}" "${DUMMY2}"
 ACTUAL=$( "${BIN}" "${DUMMY1}" test/nonexistent "${DUMMY2}" 2>&1 )
-ACTUAL="${ACTUAL#*: }"
 EXPECTED="test/nonexistent: No such file or directory"
 compare
 
@@ -846,10 +841,13 @@ compare
 
 
 # Test that one "failure" exit code overrides two "successes"
+# We need a default ACL on ${TESTDIR} because otherwise we do
+# nothing, successfully, on the symlink path.
 TESTNUM=37
 mkdir "${TESTDIR}/foo"
 ln -s foo "${TESTDIR}/bar"
 mkdir "${TESTDIR}/baz"
+setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
 "${BIN}" "${TESTDIR}/foo" "${TESTDIR}/bar" "${TESTDIR}/baz"
 ACTUAL="$?"
 EXPECTED="1"