svn commit: lorikeet r580 - in trunk/heimdal/tests: db gss kdc

[abartlet at samba.org]

Author: abartlet
Date: 2006-10-09 05:57:42 +0000 (Mon, 09 Oct 2006)
New Revision: 580

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=580

Log:
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.

Andrew Bartlett

Modified:
   trunk/heimdal/tests/db/add-modify-delete.in
   trunk/heimdal/tests/gss/check-gss.in
   trunk/heimdal/tests/gss/check-gssmask.in
   trunk/heimdal/tests/kdc/check-digest.in
   trunk/heimdal/tests/kdc/check-kdc.in


Changeset:
Modified: trunk/heimdal/tests/db/add-modify-delete.in
===================================================================
--- trunk/heimdal/tests/db/add-modify-delete.in	2006-10-08 08:19:52 UTC (rev 579)
+++ trunk/heimdal/tests/db/add-modify-delete.in	2006-10-09 05:57:42 UTC (rev 580)
@@ -39,7 +39,7 @@
 
 R=EXAMPLE.ORG
 
-kadmin="../../kadmin/kadmin -l -r $R"
+kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
 
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG

Modified: trunk/heimdal/tests/gss/check-gss.in
===================================================================
--- trunk/heimdal/tests/gss/check-gss.in	2006-10-08 08:19:52 UTC (rev 579)
+++ trunk/heimdal/tests/gss/check-gss.in	2006-10-09 05:57:42 UTC (rev 580)
@@ -37,8 +37,8 @@
 objdir="@objdir@"
 gssdir="${objdir}/../../lib/gssapi"
 
-${gssdir}/gss help > /dev/null || exit 1
-${gssdir}/gss supported-mechanisms > /dev/null || exit 1
+${TESTS_ENVIRONMENT} ${gssdir}/gss help > /dev/null || exit 1
+${TESTS_ENVIRONMENT} ${gssdir}/gss supported-mechanisms > /dev/null || exit 1
 
 exit 0
 

Modified: trunk/heimdal/tests/gss/check-gssmask.in
===================================================================
--- trunk/heimdal/tests/gss/check-gssmask.in	2006-10-08 08:19:52 UTC (rev 579)
+++ trunk/heimdal/tests/gss/check-gssmask.in	2006-10-09 05:57:42 UTC (rev 580)
@@ -41,12 +41,12 @@
 
 port=8888
 
-kadmin="../../kadmin/kadmin -l -r $R"
-kdc="../../kdc/kdc --addresses=localhost -P $port"
+kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
+kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
 keytabfile=${objdir}/server.keytab
 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"
 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"

Modified: trunk/heimdal/tests/kdc/check-digest.in
===================================================================
--- trunk/heimdal/tests/kdc/check-digest.in	2006-10-08 08:19:52 UTC (rev 579)
+++ trunk/heimdal/tests/kdc/check-digest.in	2006-10-09 05:57:42 UTC (rev 580)
@@ -41,8 +41,8 @@
 
 port=8888
 
-kadmin="../../kadmin/kadmin -l -r $R"
-kdc="../../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.example.org
 cache="FILE:${objdir}/cache.krb5"
@@ -50,9 +50,9 @@
 keytabfile=${objdir}/server.keytab
 keytab="FILE:${keytabfile}"
 
-kinit="../../kuser/kinit -c $cache --no-afslog"
-klist="../../kuser/klist -c $cache"
-kdigest="../../kuser/kdigest --ccache=$cache"
+kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
+klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
+kdigest="${TESTS_ENVIRONMENT} ../../kuser/kdigest --ccache=$cache"
 
 username=foo
 userpassword=digestpassword
@@ -88,7 +88,7 @@
 echo Starting kdc
 ${kdc} &
 kdcpid=$!
-sleep 2
+sleep 20
 
 if tail -1 messages.log | grep "No sockets" ; then
     echo "The KDC failed to bind to any sockets, another KDC running ?"

Modified: trunk/heimdal/tests/kdc/check-kdc.in
===================================================================
--- trunk/heimdal/tests/kdc/check-kdc.in	2006-10-08 08:19:52 UTC (rev 579)
+++ trunk/heimdal/tests/kdc/check-kdc.in	2006-10-09 05:57:42 UTC (rev 580)
@@ -42,8 +42,8 @@
 
 port=8888
 
-kadmin="../../kadmin/kadmin -l -r $R"
-kdc="../../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.example.org
 server2=host/computer.example.com
@@ -56,14 +56,14 @@
 ps="proxy-service@${R}"
 aesenctype="aes256-cts-hmac-sha1-96"
 
-kinit="../../kuser/kinit -c $cache --no-afslog"
-klist="../../kuser/klist -c $cache"
-kgetcred="../../kuser/kgetcred -c $cache"
-kgetcred_imp="../../kuser/kgetcred -c $cache --out-cache=${ocache}"
-kdestroy="../../kuser/kdestroy -c $cache"
-ktutil="../../admin/ktutil"
-hxtool="../../lib/hx509/hxtool"
-kimpersonate="../../kuser/kimpersonate -k ${keytab} --ccache=${ocache}"
+kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
+klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
+kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
+kgetcred_imp="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache --out-cache=${ocache}"
+kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache"
+ktutil="${TESTS_ENVIRONMENT} ../../admin/ktutil"
+hxtool="${TESTS_ENVIRONMENT} ../../lib/hx509/hxtool"
+kimpersonate="${TESTS_ENVIRONMENT} ../../kuser/kimpersonate -k ${keytab} --ccache=${ocache}"
 
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG
@@ -129,7 +129,7 @@
 echo Starting kdc
 ${kdc} &
 kdcpid=$!
-sleep 2
+sleep 20
 
 if tail -1 messages.log | grep "No sockets" ; then
     echo "The KDC failed to bind to any sockets, another KDC running ?"