diff options
| author | relyea%netscape.com <devnull@localhost> | 2000-09-27 23:51:33 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2000-09-27 23:51:33 +0000 |
| commit | 845ec9f004471e7dfd4b76686f0cbfc2d3f84946 (patch) | |
| tree | 482d1f35d597dcb3d98de1679fcc3fdc0e448a1c | |
| parent | 40f3b359f12bba85f15d5701ff1e561166a45e5a (diff) | |
| download | nss-hg-845ec9f004471e7dfd4b76686f0cbfc2d3f84946.tar.gz | |
Merge Tip fixes for the test cases back into the branch.
| -rwxr-xr-x | security/nss/tests/ssl/ssl.sh | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/security/nss/tests/ssl/ssl.sh b/security/nss/tests/ssl/ssl.sh index 9b151a097..bdb397139 100755 --- a/security/nss/tests/ssl/ssl.sh +++ b/security/nss/tests/ssl/ssl.sh @@ -210,7 +210,7 @@ do else selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} & fi - sleep 10 + sleep 20 tstclnt -p ${PORT} -h ${HOST} -c ${param} ${TLS_FLAG} -f -d . < ${REQUEST_FILE} if [ $? -ne 0 ]; then @@ -248,13 +248,25 @@ do else selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} & fi - sleep 10 + sleep 20 pwd echo "tstclnt -p ${PORT} -h ${HOST} -f -d ${CLIENTDIR} ${cparam}" tstclnt -p ${PORT} -h ${HOST} -f -d ${CLIENTDIR} ${cparam} < ${REQUEST_FILE} - rc=$? -echo "Return code = $rc expected value = ${value} " - if [ $rc -ne ${value} ]; then + ret=$? + +# +# for some reason the NT client does not return the same error code as Unix +# (sigh). +# + if [ ${OS_ARCH} = "WINNT" ]; then + if [ $value -ne 0 ]; then + if [ $ret -ne 0 ]; then + value=$ret + fi + fi + fi + + if [ $ret -ne $value ]; then echo "<TR><TD>"${testname}"</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS} else echo "<TR><TD>"${testname}"</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS} @@ -290,7 +302,7 @@ do else selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} & fi - sleep 10 + sleep 20 strsclnt -p ${PORT} ${HOST} -d . -w nss $cparam if [ $? -ne $value ]; then |