X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=e4ca3766721bdb58ff661aa246c3ff0915bc2523;hb=7ce092ba47607098bb57695396357b8eab90e81b;hp=d75e91eaa74f03b08929426c1268225fbba42ddd;hpb=fce58c087eff25e4af70012ae05607cdfe5f2abf;p=apply-default-acl.git diff --git a/run-tests.sh b/run-tests.sh index d75e91e..e4ca376 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