run-tests.sh: simplify the EXPECTED output in test 32.

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

diff --git a/run-tests.sh b/run-tests.sh
index c1721287c339431de6e9e4d8f0afad93b246ceb3..d8b5ecdff091b63ff8ae911a4ff2c263d3d9280a 100755 (executable)
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -783,15 +783,9 @@ mkdir -p $(dirname "${TARGET}")
 touch "${TARGET}"
 ln -s foo "${LINK2FOO}"
 setfacl --default --modify user:${USERS[0]}:rw $(dirname "${TARGET}")
+EXPECTED=$(getfacl --omit-header "${TARGET}")
 "${BIN}" "${LINK2FOO}/bar/baz"
 ACTUAL=$( getfacl --omit-header "${TARGET}" )
-EXPECTED=$(cat <<EOF
-user::rw-
-group::r--
-other::r--
-
-EOF
-)
 compare
 
 
@@ -818,8 +812,7 @@ EXPECTED="1"
 compare
 
 
-# The previous test should "succeed" if we use --recursive. This is
-# buggy, but it's documented.
+# The previous test should fail, even if we use --recursive.
 TESTNUM=35
 TARGET="${TESTDIR}/bar"
 touch "${TESTDIR}/foo"
@@ -827,7 +820,7 @@ ln -s foo "${TARGET}"
 setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
 "${BIN}" --recursive "${TARGET}"
 ACTUAL="$?"
-EXPECTED="0"
+EXPECTED="1"
 compare
 
 
@@ -854,15 +847,14 @@ EXPECTED="1"
 compare
 
 
-# And test the buggy behavior again; the previous test should return
-# success (ignoring the failure) when --recursive is used.
+# The failure should prevail when using --recursive, too.
 TESTNUM=38
 mkdir "${TESTDIR}/foo"
 ln -s foo "${TESTDIR}/bar"
 mkdir "${TESTDIR}/baz"
 "${BIN}" --recursive "${TESTDIR}"
 ACTUAL="$?"
-EXPECTED="0"
+EXPECTED="1"
 compare
 
 
@@ -913,3 +905,17 @@ EXPECTED=$( getfacl --omit-header "${TARGET}-direct" )
 "${BIN}" --recursive "${TESTDIR}"
 ACTUAL=$( getfacl --omit-header "${TARGET}" )
 compare
+
+
+# Ensure that we don't get "error" results for symlinks encountered
+# during a recursive traversal.
+TESTNUM=43
+TARGET="${TESTDIR}"
+mkdir "${TARGET}/foo"
+mkdir "${TARGET}/bar"
+ln -s "../foo" "${TARGET}/bar/baz"
+setfacl --default --modify user:${USERS[0]}:rw "${TARGET}"
+EXPECTED="1"
+"${BIN}" --recursive "${TARGET}"
+ACTUAL=$?
+compare