migrate to ${env_setup}
This commit is contained in:
@@ -34,27 +34,27 @@
|
|||||||
# $Id$
|
# $Id$
|
||||||
#
|
#
|
||||||
|
|
||||||
|
top_builddir="@top_builddir@"
|
||||||
|
env_setup="@env_setup@"
|
||||||
srcdir="@srcdir@"
|
srcdir="@srcdir@"
|
||||||
objdir="@objdir@"
|
objdir="@objdir@"
|
||||||
EGREP="@EGREP@"
|
|
||||||
|
. ${env_setup}
|
||||||
|
|
||||||
testfailed="echo test failed; 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
|
${have_db} || exit 77
|
||||||
|
|
||||||
R=TEST.H5L.SE
|
R=TEST.H5L.SE
|
||||||
|
|
||||||
port=@port@
|
port=@port@
|
||||||
pwport=@pwport@
|
pwport=@pwport@
|
||||||
|
|
||||||
kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit --password-file=${objdir}/foopassword --no-afslog"
|
kinit="${kinit} --password-file=${objdir}/foopassword --no-afslog"
|
||||||
klist="${TESTS_ENVIRONMENT} ../../kuser/klist"
|
kdestroy="${kdestroy} --no-unlog"
|
||||||
kswitch="${TESTS_ENVIRONMENT} ../../kuser/kswitch"
|
kadmin="${kadmin} -l -r $R"
|
||||||
kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy --no-unlog"
|
kdc="${kdc} --addresses=localhost -P $port"
|
||||||
kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
|
|
||||||
kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
|
|
||||||
|
|
||||||
|
|
||||||
server=host/datan.test.h5l.se
|
server=host/datan.test.h5l.se
|
||||||
cache="FILE:${objdir}/cache.krb5"
|
cache="FILE:${objdir}/cache.krb5"
|
||||||
@@ -94,7 +94,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
|
||||||
@@ -151,7 +151,7 @@ ${klist} -l | grep bar@ >/dev/null && { ec=1 ; eval "${testfailed}"; }
|
|||||||
|
|
||||||
|
|
||||||
echo "killing kdc (${kdcpid})"
|
echo "killing kdc (${kdcpid})"
|
||||||
sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
|
sh ${leaks_kill} kdc $kdcpid || exit 1
|
||||||
|
|
||||||
trap "" EXIT
|
trap "" EXIT
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user