doc/man/apply-default-acl.1: remove superfluous line breaks.

[apply-default-acl.git] / run-tests.sh

diff --git a/run-tests.sh b/run-tests.sh
index d87c678b811e90ce23bf32514914dbd0c0901460..e4ca3766721bdb58ff661aa246c3ff0915bc2523 100755 (executable)
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -671,14 +671,16 @@ compare
 # If we call apply-default-acl on a single file that does not exist,
 # we get the expected error.
 TESTNUM=25
-ACTUAL=$( ${BIN} test/nonexistent 2>&1 )
-EXPECTED="${BIN}: test/nonexistent: No such file or directory"
+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 )
-EXPECTED="${BIN}: test/nonexistent: No such file or directory"
+ACTUAL=$( "${BIN}" --recursive test/nonexistent 2>&1 )
+ACTUAL="${ACTUAL#*: }"
+EXPECTED="test/nonexistent: No such file or directory"
 compare
 
 # If we call apply-default-acl on more than one file, it should report any
@@ -687,8 +689,9 @@ TESTNUM=27
 DUMMY1="${TESTDIR}/dummy1"
 DUMMY2="${TESTDIR}/dummy2"
 touch "${DUMMY1}" "${DUMMY2}"
-ACTUAL=$( ${BIN} "${DUMMY1}" test/nonexistent "${DUMMY2}" 2>&1 )
-EXPECTED="${BIN}: test/nonexistent: No such file or directory"
+ACTUAL=$( "${BIN}" "${DUMMY1}" test/nonexistent "${DUMMY2}" 2>&1 )
+ACTUAL="${ACTUAL#*: }"
+EXPECTED="test/nonexistent: No such file or directory"
 compare
 
 
@@ -760,7 +763,7 @@ LINK2TARGET="${TESTDIR}/baz"
 mkdir -p $(dirname "${TARGET}")
 touch "${TARGET}"
 ln -s foo "${TESTDIR}/baz"
-setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}/foo"
+setfacl --default --modify user:${USERS[0]}:rw $(dirname "${TARGET}")
 pushd "${TESTDIR}/baz" > /dev/null
 "${BIN}" bar
 popd > /dev/null
@@ -775,3 +778,23 @@ other::r--
 EOF
 )
 compare
+
+
+# Ensure that symlinks in non-terminal path components are not followed.
+TESTNUM=32
+TARGET="${TESTDIR}/foo/bar/baz"
+LINK2FOO="${TESTDIR}/quux"
+mkdir -p $(dirname "${TARGET}")
+touch "${TARGET}"
+ln -s foo "${LINK2FOO}"
+setfacl --default --modify user:${USERS[0]}:rw $(dirname "${TARGET}")
+"${BIN}" "${LINK2FOO}/bar/baz"
+ACTUAL=$( getfacl --omit-header "${TARGET}" )
+EXPECTED=$(cat <<EOF
+user::rw-
+group::r--
+other::r--
+
+EOF
+)
+compare