diff options
author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-08-18 11:17:18 +0200 |
---|---|---|
committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-08-18 11:17:18 +0200 |
commit | 09b8fe651ffe6895baa2f8701b1c9e3d37c8da7f (patch) | |
tree | 04ceaef7a16388a73befbddee49f51e9c210c24b /tests/cert | |
parent | bab319624b8a3ad474b7767a2498f698d1d4ba86 (diff) | |
download | nss-hg-09b8fe651ffe6895baa2f8701b1c9e3d37c8da7f.tar.gz |
Bug 1370667 - don't do startup tests when not in fips mode, r=ttaubert,rrelyea
Differential Revision: https://nss-review.dev.mozaws.net/D348
Diffstat (limited to 'tests/cert')
-rwxr-xr-x | tests/cert/cert.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/cert/cert.sh b/tests/cert/cert.sh index 9b3455747..be589ef7c 100755 --- a/tests/cert/cert.sh +++ b/tests/cert/cert.sh @@ -1975,19 +1975,19 @@ cert_test_ocspresp() cert_cleanup() { cert_log "$SCRIPTNAME: finished $SCRIPTNAME" - html "</TABLE><BR>" + html "</TABLE><BR>" cd ${QADIR} . common/cleanup.sh } ################## main ################################################# -cert_init +cert_init cert_all_CA -cert_extended_ssl -cert_ssl -cert_smime_client -if [ -z "$NSS_TEST_DISABLE_FIPS" ]; then +cert_extended_ssl +cert_ssl +cert_smime_client +if [[ -n "$NSS_TEST_ENABLE_FIPS" ]]; then cert_fips fi cert_eccurves @@ -2004,7 +2004,7 @@ else fi if [ -n "$DO_DIST_ST" -a "$DO_DIST_ST" = "TRUE" ] ; then - cert_stresscerts + cert_stresscerts fi cert_iopr_setup |