From 908f962644d7295c8699317bed28dd81006bd73a Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Mon, 7 Sep 2009 15:12:16 -0700 Subject: [PATCH] migrate to ${env_setup} --- tests/kdc/check-kpasswdd.in | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/kdc/check-kpasswdd.in b/tests/kdc/check-kpasswdd.in index 7159a400f..7ead2a6e1 100644 --- a/tests/kdc/check-kpasswdd.in +++ b/tests/kdc/check-kpasswdd.in @@ -34,9 +34,14 @@ # $Id$ # -srcdir="@srcdir@" +top_builddir="@top_builddir@" +env_setup="@env_setup@" 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" @@ -105,7 +110,7 @@ echo Starting kdc ${kdc} & kdcpid=$! -sh ${srcdir}/wait-kdc.sh +sh ${wait_kdc} if [ "$?" != 0 ] ; then kill -9 ${kdcpid} exit 1 @@ -191,8 +196,8 @@ ${kdestroy} echo "killing kdc (${kdcpid} ${kpasswddpid})" -sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1 -sh ${srcdir}/leaks-kill.sh kpasswdd $kpasswddpid || exit 1 +sh ${leaks_kill} kdc $kdcpid || exit 1 +sh ${leaks_kill} kpasswdd $kpasswddpid || exit 1 trap "" EXIT