X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=fc7fed4f6090fe49be8af02a561ff14a53c6e18c;hb=59bebfc82a36beb2be15b91b0b8ececd2557d557;hp=d75e91eaa74f03b08929426c1268225fbba42ddd;hpb=fb27d1a185dd5824cc2795e0283202379575368e;p=apply-default-acl.git

diff --git a/run-tests.sh b/run-tests.sh
index d75e91e..fc7fed4 100755
--- 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
 
 
@@ -795,3 +798,25 @@ other::r--
 EOF
 )
 compare
+
+
+# Test that our exit code succeeds on a single, normal path.
+TESTNUM=33
+TARGET="${TESTDIR}/foo"
+touch "${TARGET}"
+setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
+"${BIN}" "${TARGET}"
+ACTUAL="$?"
+EXPECTED="0"
+compare
+
+# Test that our exit code fails on a symlink.
+TESTNUM=34
+TARGET="${TESTDIR}/bar"
+touch "${TESTDIR}/foo"
+ln -s foo "${TARGET}"
+setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
+"${BIN}" "${TARGET}"
+ACTUAL="$?"
+EXPECTED="1"
+compare