36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
diff -up nss/tests/all.sh.sql-default nss/tests/all.sh
|
|
--- nss/tests/all.sh.sql-default 2020-06-17 00:50:59.000000000 +0200
|
|
+++ nss/tests/all.sh 2020-07-22 17:41:08.591206201 +0200
|
|
@@ -114,8 +114,6 @@ RUN_FIPS=""
|
|
########################################################################
|
|
run_tests()
|
|
{
|
|
- echo "Running test cycle: ${TEST_MODE} ----------------------"
|
|
- echo "List of tests that will be executed: ${TESTS}"
|
|
for TEST in ${TESTS}
|
|
do
|
|
# NOTE: the spaces are important. If you don't include
|
|
@@ -173,9 +171,8 @@ run_cycle_pkix()
|
|
|
|
export -n NSS_SSL_RUN
|
|
|
|
- # use the default format. (unset for the shell, export -n for binaries)
|
|
+ # use the default format
|
|
export -n NSS_DEFAULT_DB_TYPE
|
|
- unset NSS_DEFAULT_DB_TYPE
|
|
|
|
run_tests
|
|
}
|
|
diff -up nss/tests/merge/merge.sh.sql-default nss/tests/merge/merge.sh
|
|
--- nss/tests/merge/merge.sh.sql-default 2020-06-17 00:50:59.000000000 +0200
|
|
+++ nss/tests/merge/merge.sh 2020-07-22 17:24:45.819348633 +0200
|
|
@@ -98,7 +98,7 @@ merge_init()
|
|
# are dbm databases.
|
|
if [ "${TEST_MODE}" = "UPGRADE_DB" ]; then
|
|
save=${NSS_DEFAULT_DB_TYPE}
|
|
- NSS_DEFAULT_DB_TYPE=dbm ; export NSS_DEFAULT_DB_TYPE
|
|
+ NSS_DEFAULT_DB_TYPE= ; export NSS_DEFAULT_DB_TYPE
|
|
fi
|
|
|
|
certutil -N -d ${CONFLICT1DIR} -f ${R_PWFILE}
|
