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

Heimdal uses TESTS_ENVIRONMENT before every binary being tested directly from the Makefile. This now uses the same for the scripts, so we can run them under valgrind. From Andrew Bartlet

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18389 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-10 09:30:20 +00:00
parent 4f9be7d03f
commit fc309685c9
5 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/db/add-modify-delete.in
View File

@@ -39,7 +39,7 @@ objdir="@objdir@"
R=EXAMPLE.ORG R=EXAMPLE.ORG
kadmin="../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG

4
tests/gss/check-gss.in
View File

@@ -37,8 +37,8 @@
objdir="@objdir@" objdir="@objdir@"
gssdir="${objdir}/../../lib/gssapi" gssdir="${objdir}/../../lib/gssapi"
${gssdir}/gss help > /dev/null || exit 1 ${TESTS_ENVIRONMENT} ${gssdir}/gss help > /dev/null || exit 1
${gssdir}/gss supported-mechanisms > /dev/null || exit 1 ${TESTS_ENVIRONMENT} ${gssdir}/gss supported-mechanisms > /dev/null || exit 1
exit 0 exit 0

9
tests/gss/check-gssmask.in
View File

@@ -41,12 +41,12 @@ R=EXAMPLE.ORG
port=8888 port=8888
kadmin="../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
kdc="../../kdc/kdc --addresses=localhost -P $port" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
keytabfile=${objdir}/server.keytab keytabfile=${objdir}/server.keytab
keytab="FILE:${keytabfile}" keytab="FILE:${keytabfile}"
gssmask="../../appl/gssmask/gssmask" gssmask="${TESTS_ENVIRONMENT} ../../appl/gssmask/gssmask"
gssmaskn1="${gssmask} -p 8889 --spn=host/n1.example.org@${R} --logfile=n1.log" gssmaskn1="${gssmask} -p 8889 --spn=host/n1.example.org@${R} --logfile=n1.log"
gssmaskn2="${gssmask} -p 8890 --spn=host/n2.example.org@${R} --logfile=n2.log" gssmaskn2="${gssmask} -p 8890 --spn=host/n2.example.org@${R} --logfile=n2.log"
gssmaskn3="${gssmask} -p 8891 --spn=host/n3.example.org@${R} --logfile=n3.log" gssmaskn3="${gssmask} -p 8891 --spn=host/n3.example.org@${R} --logfile=n3.log"
@@ -94,6 +94,9 @@ exitcode=0
echo "Starting client 1" echo "Starting client 1"
${gssmaskn1} --moniker=n1 & ${gssmaskn1} --moniker=n1 &
n1pid=$! n1pid=$!
#echo $n1pid
#xterm -display :0 -e g ${gssmaskn1} &
#read x
echo "Starting client 2" echo "Starting client 2"
${gssmaskn2} --moniker=n2 & ${gssmaskn2} --moniker=n2 &

12
tests/kdc/check-digest.in
View File

@@ -41,8 +41,8 @@ R=EXAMPLE.ORG
port=8888 port=8888
kadmin="../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
kdc="../../kdc/kdc --addresses=localhost -P $port" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
server=host/datan.example.org server=host/datan.example.org
cache="FILE:${objdir}/cache.krb5" cache="FILE:${objdir}/cache.krb5"
@@ -50,9 +50,9 @@ ocache="FILE:${objdir}/ocache.krb5"
keytabfile=${objdir}/server.keytab keytabfile=${objdir}/server.keytab
keytab="FILE:${keytabfile}" keytab="FILE:${keytabfile}"
kinit="../../kuser/kinit -c $cache --no-afslog" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
klist="../../kuser/klist -c $cache" klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
kdigest="../../kuser/kdigest --ccache=$cache" kdigest="${TESTS_ENVIRONMENT} ../../kuser/kdigest --ccache=$cache"
username=foo username=foo
userpassword=digestpassword userpassword=digestpassword
@@ -88,7 +88,7 @@ echo $password > ${objdir}/foopassword
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} &
kdcpid=$! kdcpid=$!
sleep 2 sleep 20
if tail -1 messages.log | grep "No sockets" ; then if tail -1 messages.log | grep "No sockets" ; then
echo "The KDC failed to bind to any sockets, another KDC running ?" echo "The KDC failed to bind to any sockets, another KDC running ?"

22
tests/kdc/check-kdc.in
View File

@@ -42,8 +42,8 @@ R2=EXAMPLE.COM
port=8888 port=8888
kadmin="../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
kdc="../../kdc/kdc --addresses=localhost -P $port" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
server=host/datan.example.org server=host/datan.example.org
server2=host/computer.example.com server2=host/computer.example.com
@@ -56,14 +56,14 @@ keytab="FILE:${keytabfile}"
ps="proxy-service@${R}" ps="proxy-service@${R}"
aesenctype="aes256-cts-hmac-sha1-96" aesenctype="aes256-cts-hmac-sha1-96"
kinit="../../kuser/kinit -c $cache --no-afslog" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
klist="../../kuser/klist -c $cache" klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
kgetcred="../../kuser/kgetcred -c $cache" kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
kgetcred_imp="../../kuser/kgetcred -c $cache --out-cache=${ocache}" kgetcred_imp="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache --out-cache=${ocache}"
kdestroy="../../kuser/kdestroy -c $cache" kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache"
ktutil="../../admin/ktutil" ktutil="${TESTS_ENVIRONMENT} ../../admin/ktutil"
hxtool="../../lib/hx509/hxtool" hxtool="${TESTS_ENVIRONMENT} ../../lib/hx509/hxtool"
kimpersonate="../../kuser/kimpersonate -k ${keytab} --ccache=${ocache}" kimpersonate="${TESTS_ENVIRONMENT} ../../kuser/kimpersonate -k ${keytab} --ccache=${ocache}"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG
@@ -129,7 +129,7 @@ echo foo > ${objdir}/foopassword
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} &
kdcpid=$! kdcpid=$!
sleep 2 sleep 20
if tail -1 messages.log | grep "No sockets" ; then if tail -1 messages.log | grep "No sockets" ; then
echo "The KDC failed to bind to any sockets, another KDC running ?" echo "The KDC failed to bind to any sockets, another KDC running ?"