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

Use --detach in tests to avoid waiting

Browse Source
This commit is contained in:
Nicolas Williams
2016-12-04 16:42:33 -06:00
parent 8735d47d8b
commit 2027aa11ed
26 changed files with 95 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/bin/setup-env.in
View File

@@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
HEIM_PIDFILE_DIR="${objdir}/"
export HEIM_PIDFILE_DIR
unset KRB5_CONFIG unset KRB5_CONFIG
unset KRB5CCNAME unset KRB5CCNAME
@@ -48,6 +51,13 @@ test_kuserok="${TESTS_ENVIRONMENT} ${top_builddir}/lib/krb5/test_kuserok"
have_db="${top_builddir}/tests/db/have-db" have_db="${top_builddir}/tests/db/have-db"
leaks_kill="${top_srcdir}/tests/kdc/leaks-kill.sh" leaks_kill="${top_srcdir}/tests/kdc/leaks-kill.sh"
wait_kdc="${top_srcdir}/tests/kdc/wait-kdc.sh" wait_kdc="${top_srcdir}/tests/kdc/wait-kdc.sh"
getpid () {
if [ -f "$HEIM_PIDFILE_DIR/lt-${1}.pid" ]; then
cat "$HEIM_PIDFILE_DIR/lt-${1}.pid"
else
cat "$HEIM_PIDFILE_DIR/${1}.pid"
fi
}
if [ ! "${NO_AFS}" ] ; then if [ ! "${NO_AFS}" ] ; then
afs_no_unlog="--no-unlog" afs_no_unlog="--no-unlog"

10
tests/gss/check-basic.in
View File

@@ -94,14 +94,8 @@ echo "Doing database check"
${kadmin} check ${R} || exit 1 ${kadmin} check ${R} || exit 1
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} --testing --detach || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${srcdir}/../kdc/wait-kdc.sh
if [ "$?" != 0 ] ; then
kill ${kdcpid}
exit 1
fi
trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

10
tests/gss/check-context.in
View File

@@ -114,14 +114,8 @@ ${kadmin} check ${R} || exit 1
echo u1 > ${objdir}/foopassword echo u1 > ${objdir}/foopassword
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${srcdir}/../kdc/wait-kdc.sh
if [ "$?" != 0 ] ; then
kill ${kdcpid}
exit 1
fi
trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

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

@@ -88,14 +88,8 @@ echo "Doing database check"
${kadmin} check ${R} || exit 1 ${kadmin} check ${R} || exit 1
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${srcdir}/../kdc/wait-kdc.sh
if [ "$?" != 0 ] ; then
kill ${kdcpid}
exit 1
fi
trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

10
tests/gss/check-ntlm.in
View File

@@ -106,14 +106,8 @@ echo u1 > ${objdir}/foopassword
echo ds > ${objdir}/barpassword echo ds > ${objdir}/barpassword
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${srcdir}/../kdc/wait-kdc.sh
if [ "$?" != 0 ] ; then
kill ${kdcpid}
exit 1
fi
trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

10
tests/gss/check-spnego.in
View File

@@ -105,14 +105,8 @@ echo u1 > ${objdir}/foopassword
echo ds > ${objdir}/barpassword echo ds > ${objdir}/barpassword
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${srcdir}/../kdc/wait-kdc.sh
if [ "$?" != 0 ] ; then
kill ${kdcpid}
exit 1
fi
trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

1
tests/java/Makefile.am
View File

@@ -13,6 +13,7 @@ TESTS = $(SCRIPT_TESTS)
port = 49188 port = 49188
do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \ do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
-e 's,[@]env_setup[@],$(top_builddir)/tests/bin/setup-env,g' \
-e 's,[@]port[@],$(port),g' \ -e 's,[@]port[@],$(port),g' \
-e 's,[@]objdir[@],$(top_builddir)/tests/java,g' -e 's,[@]objdir[@],$(top_builddir)/tests/java,g'

13
tests/java/check-kinit.in
View File

@@ -35,9 +35,12 @@
# #
srcdir="@srcdir@" srcdir="@srcdir@"
env_setup="@env_setup@"
objdir="@objdir@" objdir="@objdir@"
port="@port@" port="@port@"
. ${env_setup}
# Disable test if: no data, no java, or socket wrapper # Disable test if: no data, no java, or socket wrapper
../db/have-db || exit 77 ../db/have-db || exit 77
sh ${srcdir}/have-java.sh || exit 77 sh ${srcdir}/have-java.sh || exit 77
@@ -87,14 +90,8 @@ ${kadmin} add -p kaka --use-defaults ${server}@${R} || exit 1
${kadmin} ext -k ${keytab} ${server}@${R} || exit 1 ${kadmin} ext -k ${keytab} ${server}@${R} || exit 1
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${srcdir}/../kdc/wait-kdc.sh
if [ "$?" != 0 ] ; then
kill ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

10
tests/kdc/check-canon.in
View File

@@ -99,14 +99,8 @@ ${kadmin} check ${R3} || exit 1
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo "Starting kdc" ; > messages.log echo "Starting kdc" ; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

10
tests/kdc/check-cc.in
View File

@@ -88,14 +88,8 @@ ${kadmin} check ${R} || exit 1
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

10
tests/kdc/check-delegation.in
View File

@@ -102,14 +102,8 @@ ${kadmin} check ${R4} || exit 1
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc; > messages.log echo Starting kdc; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

10
tests/kdc/check-des.in
View File

@@ -96,14 +96,8 @@ ${kadmin} check ${R} || exit 1
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc; > messages.log echo Starting kdc; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

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

@@ -94,14 +94,9 @@ ${kadmin} check ${R} || exit 1
echo $password > ${objdir}/foopassword echo $password > ${objdir}/foopassword
echo "Starting kdc" ; > messages.log echo "Starting kdc" ; > messages.log
env ${HEIM_MALLOC_DEBUG} ${kdc} & env ${HEIM_MALLOC_DEBUG} ${kdc} --detach --testing ||
kdcpid=$! { echo "kdc failed to start"; exit 1; }
kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; cat messages.log; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; cat messages.log; exit 1;" EXIT

10
tests/kdc/check-fast.in
View File

@@ -88,14 +88,8 @@ echo bar > ${objdir}/barpassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \ env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; cat messages.log; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; cat messages.log; exit 1;" EXIT

10
tests/kdc/check-hdb-mitdb.in
View File

@@ -85,14 +85,8 @@ echo foo > ${objdir}/foopassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \ env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

45
tests/kdc/check-iprop.in
View File

@@ -128,23 +128,22 @@ ipropd_slave="${ipropd_slave} --status-file=iprop-slave-status"
trap "echo 'killing ipropd s + m + kdc'; kill -9 \${ipdm} \${ipds} \${kdcpid} >/dev/null 2>/dev/null; tail messages.log ; tail iprop-stats; exit 1;" EXIT trap "echo 'killing ipropd s + m + kdc'; kill -9 \${ipdm} \${ipds} \${kdcpid} >/dev/null 2>/dev/null; tail messages.log ; tail iprop-stats; exit 1;" EXIT
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc} || exit 1
echo "starting master" ; > messages.log echo "starting master" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \ env ${HEIM_MALLOC_DEBUG} \
${ipropd_master} --hostname=localhost -k ${keytab} \ ${ipropd_master} --hostname=localhost -k ${keytab} \
--database=${objdir}/current-db & --database=${objdir}/current-db --detach ||
ipdm=$! { echo "ipropd-master failed to start"; exit 1; }
sh ${wait_kdc} ipropd-master || exit 1 ipdm=`getpid ipropd-master`
echo "starting slave" ; > messages.log echo "starting slave" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \ env ${HEIM_MALLOC_DEBUG} \
KRB5_CONFIG="${objdir}/krb5-slave.conf" \ KRB5_CONFIG="${objdir}/krb5-slave.conf" \
${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost & ${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} --detach localhost ||
ipds=$! { echo "ipropd-slave failed to start"; exit 1; }
ipds=`getpid ipropd-slave`
sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1 sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1
sleep 1 sleep 1
@@ -213,6 +212,7 @@ echo "kill slave and remove log and database"
sh ${leaks_kill} ipropd-slave $ipds || exit 1 sh ${leaks_kill} ipropd-slave $ipds || exit 1
rm -f iprop-slave-status rm -f iprop-slave-status
sleep 2
${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Down' iprop-stats >/dev/null || exit 1 ${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Down' iprop-stats >/dev/null || exit 1
# ----------------- checking: slave is missing changes while down # ----------------- checking: slave is missing changes while down
@@ -232,8 +232,9 @@ echo "starting slave again" ; > messages.log
> iprop-stats > iprop-stats
env ${HEIM_MALLOC_DEBUG} \ env ${HEIM_MALLOC_DEBUG} \
KRB5_CONFIG="${objdir}/krb5-slave.conf" \ KRB5_CONFIG="${objdir}/krb5-slave.conf" \
${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost & ${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} --detach localhost ||
ipds=$! { echo "ipropd-slave failed to start"; exit 1; }
ipds=`getpid ipropd-slave`
sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1 sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1
sleep 1 sleep 1
@@ -259,8 +260,9 @@ rm -f iprop-slave-status
echo "starting slave" ; > messages.log echo "starting slave" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \ env ${HEIM_MALLOC_DEBUG} \
KRB5_CONFIG="${objdir}/krb5-slave.conf" \ KRB5_CONFIG="${objdir}/krb5-slave.conf" \
${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost & ${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} --detach localhost ||
ipds=$! { echo "ipropd-slave failed to start"; exit 1; }
ipds=`getpid ipropd-slave`
sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1 sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1
sleep 1 sleep 1
@@ -304,15 +306,16 @@ cp ${objdir}/current.log.tmp ${objdir}/current.log
echo "starting master" ; > messages.log echo "starting master" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \ env ${HEIM_MALLOC_DEBUG} \
${ipropd_master} --hostname=localhost -k ${keytab} \ ${ipropd_master} --hostname=localhost -k ${keytab} \
--database=${objdir}/current-db & --database=${objdir}/current-db --detach ||
ipdm=$! { echo "ipropd-master failed to start"; exit 1; }
sh ${wait_kdc} ipropd-master || exit 1 ipdm=`getpid ipropd-master`
echo "starting slave" ; > messages.log echo "starting slave" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \ env ${HEIM_MALLOC_DEBUG} \
KRB5_CONFIG="${objdir}/krb5-slave.conf" \ KRB5_CONFIG="${objdir}/krb5-slave.conf" \
${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost & ${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} --detach localhost ||
ipds=$! { echo "ipropd-slave failed to start"; exit 1; }
ipds=`getpid ipropd-slave`
sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1 sh ${wait_kdc} ipropd-slave messages.log 'slave status change: up-to-date' || exit 1
sleep 1 sleep 1
@@ -346,9 +349,9 @@ kill -0 ${ipds} || { echo "slave no longer there"; exit 1; }
echo "Staring master again" ; > messages.log echo "Staring master again" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \ env ${HEIM_MALLOC_DEBUG} \
${ipropd_master} --hostname=localhost -k ${keytab} \ ${ipropd_master} --hostname=localhost -k ${keytab} \
--database=${objdir}/current-db & --database=${objdir}/current-db --detach ||
ipdm=$! { echo "ipropd-master failed to start"; exit 1; }
sh ${wait_kdc} ipropd-master || exit 1 ipdm=`getpid ipropd-master`
echo "probing for slave pid" echo "probing for slave pid"
kill -0 ${ipds} || { echo "slave no longer there"; exit 1; } kill -0 ${ipds} || { echo "slave no longer there"; exit 1; }

11
tests/kdc/check-kadmin.in
View File

@@ -89,15 +89,8 @@ ${kadmin} -l modify --pkinit-acl="CN=baz,DC=test,DC=h5l,DC=se" pkinit@${R} || ex
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
kill -9 ${kadmpid}
exit 1
fi
trap "kill -9 ${kdcpid} ${kadmpid}" EXIT trap "kill -9 ${kdcpid} ${kadmpid}" EXIT

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

@@ -332,18 +332,14 @@ echo notfoo > ${objdir}/notfoopassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \ env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \
${kdc} & ${kdc} --detach --testing ||
kdcpid=$! { echo "kdc failed to start"; exit 1; }
kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
echo Starting kpasswdd; > messages.log echo Starting kpasswdd; > messages.log
env ${HEIM_MALLOC_DEBUG} ${kpasswdd} & env ${HEIM_MALLOC_DEBUG} ${kpasswdd} --detach ||
kpasswddpid=$! { echo "kpasswdd failed to start"; exit 1; }
kpasswddpid=`getpid kpasswdd`
trap "kill -9 ${kdcpid} ${kpasswddpid}; echo signal killing kdc kpasswdd; exit 1;" EXIT trap "kill -9 ${kdcpid} ${kpasswddpid}; echo signal killing kdc kpasswdd; exit 1;" EXIT

10
tests/kdc/check-kinit.in
View File

@@ -107,14 +107,8 @@ if (($# == 0)); then
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

16
tests/kdc/check-kpasswdd.in
View File

@@ -102,18 +102,14 @@ ${kadmin} check ${R2} || exit 1
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
env ${HEIM_MALLOC_DEBUG} ${kdc} & env ${HEIM_MALLOC_DEBUG} ${kdc} --detach --testing ||
kdcpid=$! { echo "kdc failed to start"; exit 1; }
kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
echo Starting kpasswdd echo Starting kpasswdd
env ${HEIM_MALLOC_DEBUG} ${kpasswdd} & env ${HEIM_MALLOC_DEBUG} ${kpasswdd} --detach ||
kpasswddpid=$! { echo "kpasswdd failed to start"; exit 1; }
kpasswddpid=`getpid kpasswdd`
trap "kill -9 ${kdcpid} ${kpasswddpid}; echo signal killing kdc; exit \$ec;" EXIT trap "kill -9 ${kdcpid} ${kpasswddpid}; echo signal killing kdc; exit \$ec;" EXIT

10
tests/kdc/check-pkinit.in
View File

@@ -169,14 +169,8 @@ ${hxtool} issue-certificate \
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; cat ca.crt kdc.crt pkinit.crt ;exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; cat ca.crt kdc.crt pkinit.crt ;exit 1;" EXIT

11
tests/kdc/check-referral.in
View File

@@ -59,7 +59,6 @@ klist="${klist} -c $cache"
kgetcred="${kgetcred} -c $cache" kgetcred="${kgetcred} -c $cache"
kdestroy="${kdestroy} -c $cache ${afs_no_unlog}" kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG
@@ -101,14 +100,8 @@ ${kadmin} check ${R2} || exit 1
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT

11
tests/kdc/check-uu.in
View File

@@ -61,7 +61,6 @@ kdestroy2="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache2 ${afs_no_unlog}"
uu_server="${TESTS_ENVIRONMENT} ../../appl/test/uu_server" uu_server="${TESTS_ENVIRONMENT} ../../appl/test/uu_server"
uu_client="${TESTS_ENVIRONMENT} ../../appl/test/uu_client" uu_client="${TESTS_ENVIRONMENT} ../../appl/test/uu_client"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG
@@ -87,14 +86,8 @@ ${kadmin} check ${R} || exit 1
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc ; > messages.log echo Starting kdc ; > messages.log
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${wait_kdc}
if [ "$?" != 0 ] ; then
kill -9 ${kdcpid}
exit 1
fi
trap "kill -9 ${kdcpid} ${uuspid}; echo signal killing kdc; exit 1;" EXIT trap "kill -9 ${kdcpid} ${uuspid}; echo signal killing kdc; exit 1;" EXIT

11
tests/ldap/check-ldap.in
View File

@@ -114,15 +114,8 @@ ${kadmin} list '*' > /dev/null || exit 1
echo foo > ${objdir}/foopassword echo foo > ${objdir}/foopassword
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${srcdir}/../kdc/wait-kdc.sh
if [ "$?" != 0 ] ; then
kill ${kdcpid}
sh ${srcdir}/slapd-stop
exit 1
fi
trap "kill ${kdcpid}; echo signal killing kdc; sh ${srcdir}/slapd-stop ; exit 1;" EXIT trap "kill ${kdcpid}; echo signal killing kdc; sh ${srcdir}/slapd-stop ; exit 1;" EXIT

1
tests/plugin/Makefile.am
View File

@@ -10,6 +10,7 @@ TESTS = $(SCRIPT_TESTS)
port = 49188 port = 49188
do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \ do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
-e 's,[@]env_setup[@],$(top_builddir)/tests/bin/setup-env,g' \
-e 's,[@]port[@],$(port),g' \ -e 's,[@]port[@],$(port),g' \
-e 's,[@]objdir[@],$(top_builddir)/tests/plugin,g' \ -e 's,[@]objdir[@],$(top_builddir)/tests/plugin,g' \
-e 's,[@]EGREP[@],$(EGREP),g' -e 's,[@]EGREP[@],$(EGREP),g'

13
tests/plugin/check-pac.in
View File

@@ -35,9 +35,12 @@
# #
srcdir="@srcdir@" srcdir="@srcdir@"
env_setup="@env_setup@"
objdir="@objdir@" objdir="@objdir@"
EGREP="@EGREP@" EGREP="@EGREP@"
. ${env_setup}
testfailed="echo test failed; cat messages.log; exit 1" testfailed="echo test failed; cat messages.log; exit 1"
# If there is no useful db support compile in, disable test # If there is no useful db support compile in, disable test
@@ -92,14 +95,8 @@ echo "Empty log"
> messages.log > messages.log
echo Starting kdc echo Starting kdc
${kdc} & ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=$! kdcpid=`getpid kdc`
sh ${srcdir}/../kdc/wait-kdc.sh
if [ "$?" != 0 ] ; then
kill ${kdcpid}
exit 1
fi
trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT