diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 15:23:14 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 15:23:14 +0200 |
| commit | 6f84242a3526c6889950b43d29f1c47d05b918b2 (patch) | |
| tree | 9b06788bac84d7cf9313fa4b562a8e54a2042b65 /security/nss/tests | |
| parent | b2c78bbf83f75bf034028814329fdd43b6bfe885 (diff) | |
| download | uxp-6f84242a3526c6889950b43d29f1c47d05b918b2.tar.gz | |
Revert "Restore NSS default storage file format to DBM when no prefix is given."
This reverts commit b2c78bbf83f75bf034028814329fdd43b6bfe885.
Diffstat (limited to 'security/nss/tests')
| -rwxr-xr-x | security/nss/tests/all.sh | 3 | ||||
| -rwxr-xr-x | security/nss/tests/merge/merge.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/security/nss/tests/all.sh b/security/nss/tests/all.sh index 06a39dfe6e..8d5bd2dbba 100755 --- a/security/nss/tests/all.sh +++ b/security/nss/tests/all.sh @@ -174,8 +174,9 @@ run_cycle_pkix() NSS_SSL_TESTS=`echo "${NSS_SSL_TESTS}" | sed -e "s/normal//g" -e "s/fips//g" -e "s/_//g"` export -n NSS_SSL_RUN - # use the default format. + # use the default format. (unset for the shell, export -n for binaries) export -n NSS_DEFAULT_DB_TYPE + unset NSS_DEFAULT_DB_TYPE run_tests } diff --git a/security/nss/tests/merge/merge.sh b/security/nss/tests/merge/merge.sh index 1929b12c81..d17a8c4ef3 100755 --- a/security/nss/tests/merge/merge.sh +++ b/security/nss/tests/merge/merge.sh @@ -98,7 +98,7 @@ merge_init() # are dbm databases. if [ "${TEST_MODE}" = "UPGRADE_DB" ]; then save=${NSS_DEFAULT_DB_TYPE} - NSS_DEFAULT_DB_TYPE= ; export NSS_DEFAULT_DB_TYPE + NSS_DEFAULT_DB_TYPE=dbm ; export NSS_DEFAULT_DB_TYPE fi certutil -N -d ${CONFLICT1DIR} -f ${R_PWFILE} |