oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Don't need to start a kdc for this test.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20972 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-07 06:55:48 +00:00
parent 4fdab02867
commit a2d8867e0c
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/can/test_can.in
View File

@@ -38,7 +38,7 @@ srcdir="@srcdir@"
objdir="@objdir@" objdir="@objdir@"
EGREP="@EGREP@" EGREP="@EGREP@"
testfailed="echo test failed; cat messages.log; exit 1" testfailed="echo test failed; exit 1"
# If there is no useful db support compile in, disable test # If there is no useful db support compile in, disable test
../db/have-db || exit 77 ../db/have-db || exit 77
@@ -56,10 +56,13 @@ fi
port=@port@ port=@port@
kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
replay="${TESTS_ENVIRONMENT} ../../kdc/kdc-replay" replay="${TESTS_ENVIRONMENT} ../../kdc/kdc-replay"
KRB5_CONFIG="${objdir}/krb5.conf" if [ -f ${srcdir}/{tst}.conf ]; then
KRB5_CONFIG="${srcdir}/{tst}.conf"
else
KRB5_CONFIG="${objdir}/krb5.conf"
fi
export KRB5_CONFIG export KRB5_CONFIG
rm -f ${keytabfile} rm -f ${keytabfile}
@@ -73,25 +76,8 @@ ${kadmin} < ${srcdir}/${tst}.kadm
echo "Doing database check" echo "Doing database check"
${kadmin} check ${R} || exit 1 ${kadmin} check ${R} || exit 1
echo Starting kdc
${kdc} &
kdcpid=$!
sh ${srcdir}/../kdc/wait-kdc.sh
if [ "$?" != 0 ] ; then
kill ${kdcpid}
exit 1
fi
trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
ec=0 ec=0
${replay} ${srcdir}/${tst}.req || { ec=1 ; eval "${testfailed}"; } ${replay} ${srcdir}/${tst}.req || { ec=1 ; eval "${testfailed}"; }
echo "killing kdc (${kdcpid})"
kill $kdcpid || exit 1
trap "" EXIT
exit $ec exit $ec