From fc309685c9420b5ca1129060b9279a9fb2ce5f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Tue, 10 Oct 2006 09:30:20 +0000
Subject: [PATCH] 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

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18389 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 tests/db/add-modify-delete.in |  2 +-
 tests/gss/check-gss.in        |  4 ++--
 tests/gss/check-gssmask.in    |  9 ++++++---
 tests/kdc/check-digest.in     | 12 ++++++------
 tests/kdc/check-kdc.in        | 22 +++++++++++-----------
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/tests/db/add-modify-delete.in b/tests/db/add-modify-delete.in
index 8e7f76fd8..6aacb1a87 100644
--- a/tests/db/add-modify-delete.in
+++ b/tests/db/add-modify-delete.in
@@ -39,7 +39,7 @@ objdir="@objdir@"
 
 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
diff --git a/tests/gss/check-gss.in b/tests/gss/check-gss.in
index 6e5f3aace..5df678338 100644
--- a/tests/gss/check-gss.in
+++ b/tests/gss/check-gss.in
@@ -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
 
diff --git a/tests/gss/check-gssmask.in b/tests/gss/check-gssmask.in
index 42612e521..6a093f211 100644
--- a/tests/gss/check-gssmask.in
+++ b/tests/gss/check-gssmask.in
@@ -41,12 +41,12 @@ R=EXAMPLE.ORG
 
 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"
@@ -94,6 +94,9 @@ exitcode=0
 echo "Starting client 1"
 ${gssmaskn1} --moniker=n1 &
 n1pid=$!
+#echo $n1pid
+#xterm -display :0 -e g ${gssmaskn1} &
+#read x
 
 echo "Starting client 2"
 ${gssmaskn2} --moniker=n2 &
diff --git a/tests/kdc/check-digest.in b/tests/kdc/check-digest.in
index 43b74a00f..f2f3c0ab9 100644
--- a/tests/kdc/check-digest.in
+++ b/tests/kdc/check-digest.in
@@ -41,8 +41,8 @@ R=EXAMPLE.ORG
 
 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 @@ ocache="FILE:${objdir}/ocache.krb5"
 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 $password > ${objdir}/foopassword
 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 ?"
diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
index 4dedb3c2f..049e9b773 100644
--- a/tests/kdc/check-kdc.in
+++ b/tests/kdc/check-kdc.in
@@ -42,8 +42,8 @@ R2=EXAMPLE.COM
 
 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 @@ keytab="FILE:${keytabfile}"
 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 foo > ${objdir}/foopassword
 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 ?"