|
 |
b31f4f |
diff -up ./tests/all.sh.sql-default-tests ./tests/all.sh
|
|
|
b31f4f |
--- ./tests/all.sh.sql-default-tests 2021-06-03 15:44:45.759708770 -0700
|
|
|
b31f4f |
+++ ./tests/all.sh 2021-06-03 15:50:12.649678081 -0700
|
|
|
83c154 |
@@ -51,10 +51,10 @@
|
|
|
83c154 |
# pkix - run test suites with PKIX enabled
|
|
|
83c154 |
# upgradedb - upgrade existing certificate databases to shareable
|
|
|
83c154 |
# format (creates them if doesn't exist yet) and run
|
|
|
b31f4f |
-# test suites with those databases. Requires to enable libdm.
|
|
|
b31f4f |
+# test suites with those databases.
|
|
|
83c154 |
# sharedb - run test suites with shareable database format
|
|
|
83c154 |
# enabled (databases are created directly to this
|
|
|
b31f4f |
-# format). This is the default and doesn't need to be run separately.
|
|
|
b31f4f |
+# format).
|
|
|
b31f4f |
# threadunsafe - run test suites with thread unsafe environment variable
|
|
|
b31f4f |
# so simulate running NSS locking for PKCS #11 modules which
|
|
|
b31f4f |
# are not thread safe.
|
|
|
b31f4f |
@@ -137,7 +137,7 @@ run_tests()
|
|
|
83c154 |
}
|
|
|
83c154 |
|
|
|
83c154 |
########################## run_cycle_standard ##########################
|
|
|
b31f4f |
-# run test suites with sql database (no PKIX)
|
|
|
b31f4f |
+# run test suites with dbm database (no PKIX, no sharedb)
|
|
|
83c154 |
########################################################################
|
|
|
83c154 |
run_cycle_standard()
|
|
|
83c154 |
{
|
|
|
b31f4f |
@@ -146,7 +146,7 @@ run_cycle_standard()
|
|
|
83c154 |
TESTS="${ALL_TESTS}"
|
|
|
b31f4f |
TESTS_SKIP="libpkix pkits"
|
|
|
83c154 |
|
|
|
b31f4f |
- NSS_DEFAULT_DB_TYPE=${NSS_DEFAULT_DB_TYPE:-"sql"}
|
|
|
b31f4f |
+ NSS_DEFAULT_DB_TYPE=dbm
|
|
|
83c154 |
export NSS_DEFAULT_DB_TYPE
|
|
|
83c154 |
|
|
|
83c154 |
run_tests
|
|
|
b31f4f |
@@ -323,7 +323,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
|
|
|
83c154 |
. ./init.sh
|
|
|
83c154 |
fi
|
|
|
83c154 |
|
|
|
b31f4f |
-cycles="standard pkix threadunsafe"
|
|
|
b31f4f |
+cycles="standard pkix upgradedb sharedb threadunsafe"
|
|
|
83c154 |
CYCLES=${NSS_CYCLES:-$cycles}
|
|
|
83c154 |
|
|
|
83c154 |
NO_INIT_SUPPORT=`certutil --build-flags |grep -cw NSS_NO_INIT_SUPPORT`
|
|
|
b31f4f |
diff -up ./tests/common/init.sh.sql-default-tests ./tests/common/init.sh
|
|
|
b31f4f |
--- ./tests/common/init.sh.sql-default-tests 2021-05-28 02:50:43.000000000 -0700
|
|
|
b31f4f |
+++ ./tests/common/init.sh 2021-06-03 15:44:45.771708842 -0700
|
|
|
b31f4f |
@@ -651,9 +651,9 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
|
|
|
83c154 |
|
|
|
83c154 |
RELOAD_CRL=1
|
|
|
83c154 |
|
|
|
b31f4f |
- # if test mode isn't set, test scripts default to expecting sql
|
|
|
b31f4f |
+ # if test mode isn't set, test scripts default to expecting dbm
|
|
|
83c154 |
if [ "${TEST_MODE}" = "" ]; then
|
|
|
b31f4f |
- NSS_DEFAULT_DB_TYPE=${NSS_DEFAULT_DB_TYPE:-"sql"}
|
|
|
b31f4f |
+ NSS_DEFAULT_DB_TYPE="dbm"
|
|
|
83c154 |
export NSS_DEFAULT_DB_TYPE
|
|
|
83c154 |
fi
|
|
|
83c154 |
|
|
|
b31f4f |
diff -up ./tests/remote/Makefile.sql-default-tests ./tests/remote/Makefile
|
|
|
b31f4f |
--- ./tests/remote/Makefile.sql-default-tests 2021-05-28 02:50:43.000000000 -0700
|
|
|
b31f4f |
+++ ./tests/remote/Makefile 2021-06-03 15:44:45.771708842 -0700
|
|
|
b31f4f |
@@ -56,7 +56,7 @@ ifeq ($(OS_TARGET),Android)
|
|
|
83c154 |
TEST_SHELL?=$$HOME/bin/sh
|
|
|
83c154 |
ANDROID_PORT?="2222"
|
|
|
83c154 |
#Define the subset of tests that is known to work on Android
|
|
|
b31f4f |
-NSS_CYCLES?="standard pkix sharedb"
|
|
|
b31f4f |
+NSS_CYCLES?="standard pkix upgradedb sharedb"
|
|
|
83c154 |
NSS_TESTS?="cipher lowhash libpkix cert dbtests tools sdr crmf smime ssl ocsp merge pkits chains"
|
|
|
83c154 |
NSS_SSL_TESTS?="crl normal_normal iopr"
|
|
|
83c154 |
NSS_SSL_RUN?="cov auth stress"
|