diff options
| author | richard.freedman%sun.com <devnull@localhost> | 2006-03-27 23:46:52 +0000 |
|---|---|---|
| committer | richard.freedman%sun.com <devnull@localhost> | 2006-03-27 23:46:52 +0000 |
| commit | 23b38b5373fbdfd52881322ceef1876a3501778f (patch) | |
| tree | aaed8b86102c5d518da470ad11f040ff2d3bbd51 /security | |
| parent | fa91f5e14da754a48ccc7a4bfe5e26d6cb752732 (diff) | |
| download | nss-hg-23b38b5373fbdfd52881322ceef1876a3501778f.tar.gz | |
Fix calculations; output more detail information for pkix tests
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/tests/libpkix/common/libpkix_init.sh | 3 | ||||
| -rwxr-xr-x | security/nss/tests/libpkix/pkix_tests/top/runTests.sh | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/security/nss/tests/libpkix/common/libpkix_init.sh b/security/nss/tests/libpkix/common/libpkix_init.sh index f16fd9e28..05c615644 100644 --- a/security/nss/tests/libpkix/common/libpkix_init.sh +++ b/security/nss/tests/libpkix/common/libpkix_init.sh @@ -255,13 +255,16 @@ RunTests() grep "END OF TESTS FOR" ${testOut} | tail -1 | grep "COMPLETED SUCCESSFULLY" >/dev/null 2>&1 if [ $? -ne 0 ]; then + testFail=1 errors=`expr ${errors} + 1` failedpgms="${failedpgms}\n${testPgm} ${testPurpose} " # cat ${testOut} else + testFail=0 passed=`expr ${passed} + 1` fi cat ${testOut} + html_msg ${testFail} 0 "${testPgm} ${arenaCmd} ${testPurpose}" if [ ${checkmem} -eq 1 ]; then grep "(actual leaks:" ${testOut} > ${testOutMem} 2>&1 diff --git a/security/nss/tests/libpkix/pkix_tests/top/runTests.sh b/security/nss/tests/libpkix/pkix_tests/top/runTests.sh index 7bbeec86d..ca334f82c 100755 --- a/security/nss/tests/libpkix/pkix_tests/top/runTests.sh +++ b/security/nss/tests/libpkix/pkix_tests/top/runTests.sh @@ -47,6 +47,8 @@ cd ../../common . ./libpkix_init_nist.sh cd ${curdir} +part1Errors=0 +part2Errors=0 numtests=0 passed=0 testunit=TOP @@ -92,6 +94,8 @@ test_validatechain_NB NIST-Test.4.1.4 ENE $NIST TrustAnchorRootCertificate.crt D test_validatechain_NB NIST-Test.4.1.5 ENE $NIST TrustAnchorRootCertificate.crt DSACACert.crt DSAParametersInheritedCACert.crt ValidDSAParameterInheritanceTest5EE.crt EOF +part1Errors=$? + LOGGING= SOCKETTRACE=0 @@ -478,7 +482,9 @@ test_buildchain_partialchain ${LDAP} NIST-Test.4.13.13 EE $NIST InvalidDNnameCo test_buildchain_partialchain ${LDAP} NIST-Test.4.13.27 ENE $NIST ValidDNandRFC822nameConstraintsTest27EE.crt nameConstraintsDN1subCA3Cert.crt nameConstraintsDN1subCA2Cert.crt TrustAnchorRootCertificate.crt EOF -totalErrors=$? +part2Errors=$? +totalErrors=`expr ${part1Errors}+${part2Errors}` + html_msg ${totalErrors} 0 " ${testunit}: passed ${passed} of ${numtests} tests" exit ${totalErrors} |