mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 04:45:45 +00:00
undid the redirecting to a tmp file, only write the stderr to the stdout
This commit is contained in:
sonmi%netscape.com
parent
49ed8cb93a
commit
b9c1650063
@ -5,6 +5,8 @@
|
||||
#
|
||||
. ../common/init.sh
|
||||
CURDIR=`pwd`
|
||||
echo "PATH=$PATH"
|
||||
echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
|
||||
PORT=${PORT-8443}
|
||||
|
||||
# Test case files
|
||||
@ -98,8 +100,8 @@ if [ ! -d ${CADIR} ]; then
|
||||
fi
|
||||
cd ${CADIR}
|
||||
echo nss > ${PWFILE}
|
||||
echo " certutil -N -d . -f ${PWFILE} >> $CERTUTILOUT 2>&1"
|
||||
certutil -N -d . -f ${PWFILE} >> $CERTUTILOUT 2>&1
|
||||
echo " certutil -N -d . -f ${PWFILE} 2>&1"
|
||||
certutil -N -d . -f ${PWFILE} 2>&1
|
||||
|
||||
echo initialized
|
||||
echo 5 > ${CERTSCRIPT}
|
||||
@ -113,8 +115,8 @@ echo 6 >> ${CERTSCRIPT}
|
||||
echo 7 >> ${CERTSCRIPT}
|
||||
echo 9 >> ${CERTSCRIPT}
|
||||
echo n >> ${CERTSCRIPT}
|
||||
echo "certutil -S -n \"TestCA\" -s \"CN=NSS Test CA, O=BOGUS NSS, L=Mountain View, ST=California, C=US\" -t \"CTu,CTu,CTu\" -v 60 -x -d . -1 -2 -5 -f ${PWFILE} -z ${NOISE_FILE} >> $CERTUTILOUT 2>&1"
|
||||
certutil -S -n "TestCA" -s "CN=NSS Test CA, O=BOGUS NSS, L=Mountain View, ST=California, C=US" -t "CTu,CTu,CTu" -v 60 -x -d . -1 -2 -5 -f ${PWFILE} -z ${NOISE_FILE} < ${CERTSCRIPT} >> $CERTUTILOUT 2>&1
|
||||
echo "certutil -S -n \"TestCA\" -s \"CN=NSS Test CA, O=BOGUS NSS, L=Mountain View, ST=California, C=US\" -t \"CTu,CTu,CTu\" -v 60 -x -d . -1 -2 -5 -f ${PWFILE} -z ${NOISE_FILE} 2>&1"
|
||||
certutil -S -n "TestCA" -s "CN=NSS Test CA, O=BOGUS NSS, L=Mountain View, ST=California, C=US" -t "CTu,CTu,CTu" -v 60 -x -d . -1 -2 -5 -f ${PWFILE} -z ${NOISE_FILE} < ${CERTSCRIPT} 2>&1
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "<TR><TD>Creating CA Cert</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS}
|
||||
@ -129,37 +131,40 @@ if [ ! -d ${CLIENTDIR} ]; then
|
||||
mkdir -p ${CLIENTDIR}
|
||||
fi
|
||||
cd ${CLIENTDIR}
|
||||
echo " certutil -N -d . -f ${PWFILE} >> $CERTUTILOUT 2>&1"
|
||||
certutil -N -d . -f ${PWFILE} >> $CERTUTILOUT 2>&1
|
||||
echo " certutil -N -d . -f ${PWFILE} 2>&1"
|
||||
certutil -N -d . -f ${PWFILE} 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
CERTFAILED=${CERTFAILED-"Init DB"}
|
||||
fi
|
||||
echo "Import the root CA"
|
||||
echo " certutil -L -n \"TestCA\" -r -d ../CA > root.cert 2>>$CERTUTILOUT"
|
||||
certutil -L -n "TestCA" -r -d ../CA > root.cert 2>>$CERTUTILOUT
|
||||
|
||||
cat $CERTUTILOUT
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
CERTFAILED=${CERTFAILED-"Export Root"}
|
||||
fi
|
||||
echo " certutil -A -n \"TestCA\" -t \"TC,TC,TC\" -f ${PWFILE} -d . -i root.cert >> $CERTUTILOUT 2>&1"
|
||||
certutil -A -n "TestCA" -t "TC,TC,TC" -f ${PWFILE} -d . -i root.cert >> $CERTUTILOUT 2>&1
|
||||
echo " certutil -A -n \"TestCA\" -t \"TC,TC,TC\" -f ${PWFILE} -d . -i root.cert 2>&1"
|
||||
certutil -A -n "TestCA" -t "TC,TC,TC" -f ${PWFILE} -d . -i root.cert 2>&1
|
||||
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 >> $CERTUTILOUT 2>&1"
|
||||
certutil -R -s "CN=Test User, O=BOGUS NSS, L=Mountain View, ST=California, C=US" -d . -f ${PWFILE} -z ${NOISE_FILE} -o req >> $CERTUTILOUT 2>&1
|
||||
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 2>&1"
|
||||
certutil -R -s "CN=Test User, O=BOGUS NSS, L=Mountain View, ST=California, C=US" -d . -f ${PWFILE} -z ${NOISE_FILE} -o req 2>&1
|
||||
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 >> $CERTUTILOUT 2>&1"
|
||||
certutil -C -c "TestCA" -m 3 -v 60 -d ../CA -i req -o user.cert -f ${PWFILE} >> $CERTUTILOUT 2>&1
|
||||
echo "certutil -C -c "TestCA" -m 3 -v 60 -d ../CA -f ${PWFILE} -i req -o user.cert 2>&1"
|
||||
certutil -C -c "TestCA" -m 3 -v 60 -d ../CA -i req -o user.cert -f ${PWFILE} 2>&1
|
||||
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 >> $CERTUTILOUT 2>&1"
|
||||
certutil -A -n "TestUser" -t "u,u,u" -d . -f ${PWFILE} -i user.cert >> $CERTUTILOUT 2>&1
|
||||
echo "certutil -A -n \"TestUser\" -t \"u,u,u\" -d . -f ${PWFILE} -i user.cert 2>&1"
|
||||
certutil -A -n "TestUser" -t "u,u,u" -d . -f ${PWFILE} -i user.cert 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
CERTFAILED=${CERTFAILED-"Import User"}
|
||||
fi
|
||||
@ -177,8 +182,8 @@ if [ ! -d ${SERVERDIR} ]; then
|
||||
fi
|
||||
cd ${SERVERDIR}
|
||||
cp ../CA/*.db .
|
||||
echo "certutil -S -n \"${HOST}.${DOMSUF}\" -s \"CN=${HOST}.${DOMSUF}, O=BOGUS Netscape, L=Mountain View, ST=California, C=US\" -t \"Pu,Pu,Pu\" -c "TestCA" -v 60 -d . -f ${PWFILE} -z ${NOISE_FILE} >> $CERTUTILOUT 2>&1"
|
||||
certutil -S -n "${HOST}.${DOMSUF}" -s "CN=${HOST}.${DOMSUF}, O=BOGUS Netscape, L=Mountain View, ST=California, C=US" -t "Pu,Pu,Pu" -c "TestCA" -m 1 -v 60 -d . -f ${PWFILE} -z ${NOISE_FILE} >> $CERTUTILOUT 2>&1
|
||||
echo "certutil -S -n \"${HOST}.${DOMSUF}\" -s \"CN=${HOST}.${DOMSUF}, O=BOGUS Netscape, L=Mountain View, ST=California, C=US\" -t \"Pu,Pu,Pu\" -c "TestCA" -v 60 -d . -f ${PWFILE} -z ${NOISE_FILE} 2>&1"
|
||||
certutil -S -n "${HOST}.${DOMSUF}" -s "CN=${HOST}.${DOMSUF}, O=BOGUS Netscape, L=Mountain View, ST=California, C=US" -t "Pu,Pu,Pu" -c "TestCA" -m 1 -v 60 -d . -f ${PWFILE} -z ${NOISE_FILE} 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "<TR><TD>Creating Server Cert</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS}
|
||||
else
|
||||
@ -274,7 +279,9 @@ do
|
||||
#sleep 20
|
||||
pwd
|
||||
echo "tstclnt -p ${PORT} -h ${HOST} -f -d ${CLIENTDIR} ${cparam} redir from ${REQUEST_FILE}"
|
||||
tstclnt -p ${PORT} -h ${HOST} -f -d ${CLIENTDIR} ${cparam} < ${REQUEST_FILE}
|
||||
TSTCLNT_FAILED=FALSE
|
||||
TSTCLNT_FAILED=`tstclnt -p ${PORT} -h ${HOST} -f -d ${CLIENTDIR} ${cparam} \
|
||||
< ${REQUEST_FILE} || echo "TRUE"`
|
||||
ret=$?
|
||||
|
||||
#
|
||||
@ -290,8 +297,15 @@ do
|
||||
fi
|
||||
|
||||
if [ $ret -ne $value ]; then
|
||||
echo "<TR><TD>"${testname}"</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS}
|
||||
echo "FAILURE: test $testname produced a returncode of $ret, expected is $value"
|
||||
if [ "$TSTCLNT_FAILED" = "TRUE" -a $value -ne 0 -a "$O_CRON" = "ON" ]
|
||||
then
|
||||
echo "<TR><TD>"${testname}"</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS}
|
||||
echo "test $testname produced an unexpected returncode of $ret but cron and failurereturn - Fix this..."
|
||||
|
||||
else
|
||||
echo "<TR><TD>"${testname}"</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS}
|
||||
echo "FAILURE: test $testname produced a returncode of $ret, expected is $value O_CRON = $O_CRON TSTCLNT_FAILED = $TSTCLNT_FAILED"
|
||||
fi
|
||||
else
|
||||
echo "<TR><TD>"${testname}"</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS}
|
||||
echo "test $testname produced a returncode of $ret as expected "
|
||||
|
||||
Loading…
Reference in New Issue
Block a user