Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare for addition of tests whose execution depends on whether OCSP is

Browse Source 
defined in the environment. Also change a few more \n's to new lines,
because not all shells handled them properly in Display lines


git-svn-id: svn://10.0.0.236/branches/NSS_LIBPKIX_BRANCH@195302 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
richard.freedman%sun.com
2006-04-24 21:56:50 +00:00
parent 8f98179174
commit d3245f6815
2 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/security/nss/tests/libpkix/common/libpkix_init.sh
View File

@@ -56,6 +56,8 @@ doPD=0
doTop=0
doModule=0
doPki=0
doOCSP=0
doOCSPTest=0
combinedErrors=0
totalErrors=0
@@ -111,6 +113,11 @@ Cleanup()
rm -f ${HOSTDIR}/rev_data/local/$i
fi
done
for i in ${localCRLFiles}; do
if [ -f ${HOSTDIR}/rev_data/local/$i ]; then
rm -f ${HOSTDIR}/rev_data/local/$i
fi
done
fi
if [ ${doPki} -eq 1 ]; then
@@ -221,6 +228,15 @@ RunTests()
# If we want shorter command printout for NIST tests, delete next line
testPurpose=${fullTestPurpose}
# Skip OCSP tests if OCSP is not defined in the environment
if [ ${doOCSPTest} -eq 0 ]; then
hasOCSP=`echo ${args} | grep OCSP-Test`
if [ ! -z "${hasOCSP}" ]; then
Display "SKIPPING ${testPgm} ${testPurpose}"
continue
fi
fi
if [ ${doNIST} -eq 0 ]; then
hasNIST=`echo ${args} | grep NIST-Test`
if [ ! -z "${hasNIST}" ]; then

39
mozilla/security/nss/tests/libpkix/common/libpkix_init_nist.sh
View File

@@ -40,18 +40,20 @@
#
#
# Any test that use NIST files should have a tag of either NIST-Test or
# NIST-Test-Files-Used at the command option so if there is no NIST files
# Any test that uses NIST files should have a tag of either NIST-Test or
# NIST-Test-Files-Used at the command option so if there are no NIST files
# installed in the system, the test can be skipped
#
if [ -z "${NIST_FILES_DIR}" ] ; then
Display "\n*******************************************************************************"
Display ""
Display "*******************************************************************************"
Display "The environment variable NIST_FILES_DIR is not defined. Therefore"
Display "tests depending on it will be skipped. To enable these tests set"
Display "NIST_FILES_DIR to the directory where NIST Certificates and CRLs"
Display "are located."
Display "*******************************************************************************\n"
Display "*******************************************************************************"
Display ""
doNIST=0
else
@@ -60,20 +62,41 @@ else
fi
#
# Any test that use NIST Path Discovery files should have a tag of NIST-PDTest
# at the command option so if there is no NIST Path Discovery files
# Any tests that use NIST Path Discovery files should have a tag of NIST-PDTest
# at the command option so if there are no NIST Path Discovery files
# installed in the system, the test can be skipped
#
if [ ${doPD} -eq 1 -a -z "${PDVAL}" ] ; then
Display "\n*******************************************************************************"
Display ""
Display "*******************************************************************************"
Display "The environment variable PDVAL is not defined. Therefore tests"
Display "depending on it will be skipped. To enable these tests set PDVAL to"
Display "the directory where NIST Path Discovery Certificates are located."
Display "*******************************************************************************\n"
Display "*******************************************************************************"
Display ""
doNIST_PDTest=0
else
NIST_PDTEST=${PDVAL}
doNIST_PDTest=1
fi
#
# Any tests that use an OCSP Server should have a tag of OCSP-Test at the
# command option so if there is no OCSP Server installed in the system, the
# test can be skipped
#
if [ ${doOCSP} -eq 1 -a -z "${OCSP}" ] ; then
Display ""
Display "*******************************************************************************"
Display "The environment variable OCSP is not defined. Therefore tests"
Display "depending on it will be skipped. To enable these tests set OCSP"
Display "non-NULL (the actual URI used is taken from the AIA extension)."
Display "*******************************************************************************"
Display ""
doOCSPTest=0
else
doOCSPTest=1
fi