diff options
| -rwxr-xr-x | source3/script/tests/vfstest-acl/run.sh | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/source3/script/tests/vfstest-acl/run.sh b/source3/script/tests/vfstest-acl/run.sh index ea7a4cbb288..eb32a95ad47 100755 --- a/source3/script/tests/vfstest-acl/run.sh +++ b/source3/script/tests/vfstest-acl/run.sh @@ -1,12 +1,12 @@ #!/bin/sh if [ $# -lt 2 ]; then -cat <<EOF + cat <<EOF Usage: run.sh VFSTEST PREFIX EOF -exit 1; + exit 1 fi -TESTBASE=`dirname $0` +TESTBASE=$(dirname $0) VFSTEST=$1 PREFIX=$2 shift 2 @@ -15,38 +15,38 @@ ADDARGS="$*" VFSTEST_PREFIX=vfstest VFSTEST_TMPDIR=$(mktemp -d ${PREFIX}/${VFSTEST_PREFIX}_XXXXXX) -incdir=`dirname $0`/../../../../testprogs/blackbox +incdir=$(dirname $0)/../../../../testprogs/blackbox . $incdir/subunit.sh failed=0 cd $VFSTEST_TMPDIR || exit 1 -test_vfstest() +test_vfstest() { - cmd='$VFSTEST -f $TESTBASE/vfstest.cmd $ADDARGS ' - out=`eval $cmd` - ret=$? - rm -f $tmpfile - - if [ $ret != 0 ] ; then - echo "$out" - echo "command failed" - false - return - fi - - echo "$out" | grep "NT_STATUS_ACCESS_DENIED" >/dev/null 2>&1 - - if [ $? = 0 ] ; then - # got ACCESS_DENIED .. fail - echo vfstest got NT_STATUS_ACCESS_DENIED - false - else - true - fi + cmd='$VFSTEST -f $TESTBASE/vfstest.cmd $ADDARGS ' + out=$(eval $cmd) + ret=$? + rm -f $tmpfile + + if [ $ret != 0 ]; then + echo "$out" + echo "command failed" + false + return + fi + + echo "$out" | grep "NT_STATUS_ACCESS_DENIED" >/dev/null 2>&1 + + if [ $? = 0 ]; then + # got ACCESS_DENIED .. fail + echo vfstest got NT_STATUS_ACCESS_DENIED + false + else + true + fi } -testit "vfstest" test_vfstest || failed=`expr $failed + 1` +testit "vfstest" test_vfstest || failed=$(expr $failed + 1) exit $failed |