migrate to ${env_setup}

This commit is contained in:
Love Hornquist Astrand
2009-09-07 15:12:16 -07:00
parent 0a9eeb8831
commit 908f962644

View File

@@ -34,9 +34,14 @@
# $Id$ # $Id$
# #
srcdir="@srcdir@" top_builddir="@top_builddir@"
env_setup="@env_setup@"
objdir="@objdir@" objdir="@objdir@"
EGREP="@EGREP@"
. ${env_setup}
# If there is no useful db support compile in, disable test
${have_db} || exit 77
testfailed="echo test failed; cat messages.log; exit \$ec" testfailed="echo test failed; cat messages.log; exit \$ec"
@@ -105,7 +110,7 @@ echo Starting kdc
${kdc} & ${kdc} &
kdcpid=$! kdcpid=$!
sh ${srcdir}/wait-kdc.sh sh ${wait_kdc}
if [ "$?" != 0 ] ; then if [ "$?" != 0 ] ; then
kill -9 ${kdcpid} kill -9 ${kdcpid}
exit 1 exit 1
@@ -191,8 +196,8 @@ ${kdestroy}
echo "killing kdc (${kdcpid} ${kpasswddpid})" echo "killing kdc (${kdcpid} ${kpasswddpid})"
sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1 sh ${leaks_kill} kdc $kdcpid || exit 1
sh ${srcdir}/leaks-kill.sh kpasswdd $kpasswddpid || exit 1 sh ${leaks_kill} kpasswdd $kpasswddpid || exit 1
trap "" EXIT trap "" EXIT