From ff2925144f80669757ba59d66100bbeb0bbd1b07 Mon Sep 17 00:00:00 2001 From: "sonmi%netscape.com" Date: Wed, 29 Nov 2000 01:09:33 +0000 Subject: [PATCH] took out the NULL_SERVER restart code completely --- security/nss/tests/ssl/ssl.sh | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/security/nss/tests/ssl/ssl.sh b/security/nss/tests/ssl/ssl.sh index f6afc629435..0b96379183b 100755 --- a/security/nss/tests/ssl/ssl.sh +++ b/security/nss/tests/ssl/ssl.sh @@ -212,8 +212,6 @@ else echo " Wait for Server Passed" >> ${RESULTS} fi -NULL_SERVER=1 #test to see if we need to restart the server - cat ${SSLCOV} | while read tls param testname do if [ $tls != "#" ]; then @@ -225,29 +223,6 @@ do sparam="" if [ ${param} = "i" ]; then 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 " Wait for Server - NULL Failed" >> ${RESULTS} - else - echo " Wait for Server - NULL Passed" >> ${RESULTS} - fi - NULL_SERVER=1 - fi fi echo "tstclnt -p ${PORT} -h ${HOST} -c ${param} ${TLS_FLAG} -f -d . redir from ${REQUEST_FILE}"