use ${env_setup}

This commit is contained in:
Love Hornquist Astrand
2009-09-07 16:22:16 -07:00
parent 925d24daec
commit 0f4db6447f

View File

@@ -105,7 +105,7 @@ ${kadmin} check ${R2} || exit 1
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc echo Starting kdc
${kdc} & env ${HEIM_MALLOC_DEBUG} ${kdc} &
kdcpid=$! kdcpid=$!
sh ${wait_kdc} sh ${wait_kdc}
@@ -115,8 +115,7 @@ if [ "$?" != 0 ] ; then
fi fi
echo Starting kpasswdd echo Starting kpasswdd
env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \ env ${HEIM_MALLOC_DEBUG} ${kpasswdd} &
${kpasswdd} &
kpasswddpid=$! kpasswddpid=$!
trap "kill -9 ${kdcpid} ${kpasswddpid}; echo signal killing kdc; exit \$ec;" EXIT trap "kill -9 ${kdcpid} ${kpasswddpid}; echo signal killing kdc; exit \$ec;" EXIT
@@ -149,7 +148,7 @@ send ${pw}\n
expect Success expect Success
EOF EOF
${rkpty} cpw.tmp ../../kpasswd/kpasswd foo@${R} || \ ${rkpty} cpw.tmp env ${kpasswd} foo@${R} || \
{ ec=$? ; eval "${testfailed}"; } { ec=$? ; eval "${testfailed}"; }
rm cpw.tmp rm cpw.tmp