took out the NULL_SERVER restart code completely

This commit is contained in:
sonmi%netscape.com 2000-11-29 01:09:33 +00:00
Родитель 938b0b9a69
Коммит ff2925144f
1 изменённых файлов: 0 добавлений и 25 удалений

Просмотреть файл

@ -212,8 +212,6 @@ else
echo "<TR><TD> Wait for Server </TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS} echo "<TR><TD> Wait for Server </TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS}
fi fi
NULL_SERVER=1 #test to see if we need to restart the server
cat ${SSLCOV} | while read tls param testname cat ${SSLCOV} | while read tls param testname
do do
if [ $tls != "#" ]; then if [ $tls != "#" ]; then
@ -225,29 +223,6 @@ do
sparam="" sparam=""
if [ ${param} = "i" ]; then if [ ${param} = "i" ]; then
sparam='-c i' sparam='-c i'
if [ $NULL_SERVER = 0 ]
then
${KILL} `cat ${SERVERPID}` # now kill the server
wait `cat ${SERVERPID}`
if [ ${fileout} -eq 1 ]; then
cat ${SERVEROUTFILE}
fi
${SLEEP}
echo "selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -i ${SERVERPID} -w nss ${sparam} & "
if [ ${fileout} -eq 1 ]; then
selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -i ${SERVERPID} -w nss ${sparam} > ${SERVEROUTFILE} 2>&1 &
else
selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} &
fi
echo "tstclnt -p ${PORT} -h ${HOST} -q -d . < ${REQUEST_FILE}"
tstclnt -p ${PORT} -h ${HOST} -q -d . < ${REQUEST_FILE}
if [ $? -ne 0 ]; then
echo "<TR><TD> Wait for Server - NULL </TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS}
else
echo "<TR><TD> Wait for Server - NULL </TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS}
fi
NULL_SERVER=1
fi
fi fi
echo "tstclnt -p ${PORT} -h ${HOST} -c ${param} ${TLS_FLAG} -f -d . redir from ${REQUEST_FILE}" echo "tstclnt -p ${PORT} -h ${HOST} -c ${param} ${TLS_FLAG} -f -d . redir from ${REQUEST_FILE}"