merge 3.0_Branch changes to get NT to run back unto the tip.

4 files changed, 69 insertions, 14 deletions

diff --git a/security/nss/tests/all.sh b/security/nss/tests/all.sh
index ab4f0e87b..1b0479711 100755
--- a/security/nss/tests/all.sh
+++ b/security/nss/tests/all.sh
@@ -5,7 +5,7 @@
 CURDIR=`pwd`
 TESTS="sdr ssl"
 cd common
-. init.sh
+. ./init.sh
 export MOZILLA_ROOT
 export COMMON
 export DIST
diff --git a/security/nss/tests/common/arch.sh b/security/nss/tests/common/arch.sh
index 16820a699..b2f6475c4 100755
--- a/security/nss/tests/common/arch.sh
+++ b/security/nss/tests/common/arch.sh
@@ -38,7 +38,7 @@
 #
 # Macros for getting the OS architecture
 #
-if [ -s "${USE_64}" ]; then
+if [ -n "${USE_64}" ]; then
 	A64BIT_TAG=_64
 else
 	A64BIT_TAG=
@@ -135,9 +135,12 @@ fi
 #if [(,$(filter-out Linux FreeBSD,${OS_ARCH}))
 #OS_RELEASE	:= $(shell echo $(OS_RELEASE) | sed 's/-.*//')
 #endif
+if [  ${OS_ARCH} = "Linux" ]; then
+	OS_RELEASE=`echo ${OS_RELEASE} | sed 's/-.*//'`
+fi
 
 if  [ ${OS_ARCH} = "Linux" ]; then
-	OS_RELEASE=`basename ${OS_RELEASE}`
+	OS_RELEASE=`echo ${OS_RELEASE} | sed 's;\\.[0123456789]*$;;'`
 fi
 
 #######################################################################
@@ -212,6 +215,20 @@ if  [ ${OS_ARCH}  = "Windows_NT" ]; then
 fi
 fi
 
+if  [ ${OS_ARCH} = "Linux" ]; then
+	IMPL_STRATEGY=_PTH
+
+	if [ ${OS_TEST} = "ppc" ]; then
+		CPU_TAG=_ppc
+	elif [ ${OS_TEST} = "alpha" ]; then
+		CPU_TAG=_alpha
+	else
+		CPU_TAG=_x86
+	fi
+	LIBC_TAG=_glibc
+	ARCH=linux
+fi
+
 OS_TARGET=${OS_TARGET-${OS_ARCH}}
 
 if [ ${OS_TARGET} = "WIN95" ]; then
@@ -234,14 +251,14 @@ OS_CONFIG=${OS_TARGET}${OS_RELEASE}
 # to distinguish between debug and release builds.
 #
 
-if [ -s "${BUILD_OPT}" ]; then
+if [ -n "${BUILD_OPT}" ]; then
 	if [ ${OS_TARGET} = "WIN16" ]; then
 		OBJDIR_TAG=_O
 	else
 		OBJDIR_TAG=${A64BIT_TAG}_OPT
 	fi
 else
-	if [ -s "${BUILD_IDG}" ]; then
+	if [ -n "${BUILD_IDG}" ]; then
 		if [ ${OS_TARGET} = "WIN16" ]; then
 			OBJDIR_TAG=_I
 		else
@@ -278,19 +295,19 @@ fi
 OBJDIR_NAME=${OS_CONFIG}${CPU_TAG}${COMPILER_TAG}${LIBC_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}'.OBJ'
 
 #export OS_CONFIG OS_ARCH OBJDIR_NAME OS_RELEASE OBJDIR_TAG
+export OS_ARCH
 
 if [ ${OS_ARCH} = "WINNT" ]; then
 if [  ${OS_TARGET} != "WIN16" ]; then
-if [ ! -s "${BUILD_OPT}" ]; then
+if [  -z "${BUILD_OPT}" ]; then
 #
 # Define USE_DEBUG_RTL if you want to use the debug runtime library
 # (RTL) in the debug build
 #
-if [ -s "${USE_DEBUG_RTL}" ]; then
+if [ -n "${USE_DEBUG_RTL}" ]; then
 	OBJDIR_NAME=${OS_CONFIG}${CPU_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.OBJD
 fi
 fi
 fi
 fi
 
-echo ${OBJDIR_NAME}
diff --git a/security/nss/tests/common/init.sh b/security/nss/tests/common/init.sh
index bf6f3039b..019483922 100644
--- a/security/nss/tests/common/init.sh
+++ b/security/nss/tests/common/init.sh
@@ -12,7 +12,11 @@ SECURITY_ROOT=${SECURITY_ROOT-${MOZILLA_ROOT}/security/nss}
 TESTDIR=${TESTDIR-${MOZILLA_ROOT}/tests_results/security}
 . ../common/arch.sh
 OBJDIR=${OBJDIR_NAME}
+if [ ${OS_ARCH} == "WINNT" ]; then
+PATH=${DIST}/${OBJDIR}/bin\;${DIST}/${OBJDIR}/lib\;$PATH
+else
 PATH=${DIST}/${OBJDIR}/bin:${DIST}/${OBJDIR}/lib:$PATH
+fi
 export PATH
 LD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib
 export LD_LIBRARY_PATH
@@ -52,7 +56,7 @@ fi
 
 KILL="kill"
 if  [ ${OS_ARCH} = "Linux" ]; then
-        KILL="kill -kill"
+        SLEEP="sleep 30"
 fi
 
 export  KILL
diff --git a/security/nss/tests/ssl/ssl.sh b/security/nss/tests/ssl/ssl.sh
index 249345720..2beb73423 100755
--- a/security/nss/tests/ssl/ssl.sh
+++ b/security/nss/tests/ssl/ssl.sh
@@ -121,13 +121,44 @@ if [ ! -d ${CLIENTDIR} ]; then
    mkdir -p ${CLIENTDIR}
 fi
 cd ${CLIENTDIR}
-cp ${CADIR}/*.db .
-echo  "certutil -S -n \"TestUser\" -s \"CN=Test User, O=BOGUS Netscape, L=Mountain View, ST=California, C=US\" -t \"u,u,u\" -c "TestCA" -m 3 -v 60 -d . -f ${PWFILE} -z ${NOISE_FILE}"
-certutil -S -n "TestUser" -s "CN=Test User, O=BOGUS NSS, L=Mountain View, ST=California, C=US" -t "u,u,u" -c "TestCA" -m 3 -v 60 -d . -f ${PWFILE} -z ${NOISE_FILE}
+echo "   certutil -N -d . -f ${PWFILE}"
+certutil -N -d . -f ${PWFILE}
+if [ $? -ne 0 ]; then
+   CERTFAILED=${CERTFAILED-"Init DB"}
+fi
+echo "Import the root CA"
+echo "   certutil -L -n \"TestCA\" -r -d ../CA > root.cert"
+certutil -L -n "TestCA" -r -d ../CA > root.cert
 if [ $? -ne 0 ]; then
-    echo "<TR><TD>Creating client Cert</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS}
+   CERTFAILED=${CERTFAILED-"Export Root"}
+fi
+echo "   certutil -A -n \"TestCA\" -t \"TC,TC,TC\" -f ${PWFILE} -d . -i root.cert"
+certutil -A -n "TestCA" -t "TC,TC,TC" -f ${PWFILE} -d . -i root.cert
+if [ $? -ne 0 ]; then
+   CERTFAILED=${CERTFAILED-"Import Root"}
+fi
+echo "Generate a Certificate request"
+echo  "  certutil -R -s \"CN=Test User, O=BOGUS Netscape, L=Mountain View, ST=California, C=US\" -d . -f ${PWFILE} -z ${NOISE_FILE} -o req"
+certutil -R -s "CN=Test User, O=BOGUS NSS, L=Mountain View, ST=California, C=US" -d . -f ${PWFILE} -z ${NOISE_FILE} -o req
+if [ $? -ne 0 ]; then
+   CERTFAILED=${CERTFAILED-"Generate Request"}
+fi
+echo "Sign the Certificate request"
+echo  "certutil -C -c "TestCA" -m 3 -v 60 -d ../CA -f ${PWFILE} -i req -o user.cert"
+certutil -C -c "TestCA" -m 3 -v 60 -d ../CA -i req -o user.cert -f ${PWFILE}
+if [ $? -ne 0 ]; then
+   CERTFAILED=${CERTFAILED-"Sign User Cert"}
+fi
+echo "Import the new Cert"
+echo "certutil -A -n \"TestUser\" -t \"u,u,u\" -d . -f {PWFILE} -i user.cert"
+certutil -A -n "TestUser" -t "u,u,u" -d . -f {PWFILE} -i user.cert
+if [ $? -ne 0 ]; then
+   CERTFAILED=${CERTFAILED-"Import User"}
+fi
+if [ -n "${CERTFAILED}" ]; then
+    echo "<TR><TD>Creating User Cert</TD><TD bgcolor=red>Failed ($CERTFAILED)</TD><TR>" >> ${RESULTS}
 else
-    echo "<TR><TD>Creating client Cert</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS}
+    echo "<TR><TD>Creating User Cert</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS}
 fi
 
 echo "***** Creating Server CA Issued Certificate for ${HOST}.${DOMSUF} *****"
@@ -189,6 +220,7 @@ do
 	if [ ${fileout} -eq 1 ]; then
 	   cat ${SERVEROUTFILE}
 	fi
+	${SLEEP}
     fi
 done 
 
@@ -228,6 +260,7 @@ do
 	if [ ${fileout} -eq 1 ]; then
 	   cat ${SERVEROUTFILE}
 	fi
+	${SLEEP}
      fi
 done 
 
@@ -266,6 +299,7 @@ do
 	if [ ${fileout} -eq 1 ]; then
 	   cat ${SERVEROUTFILE}
 	fi
+	${SLEEP}
      fi
 done