diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/all.sh | 10 | ||||
| -rw-r--r-- | tests/common/init.sh | 4 | ||||
| -rw-r--r-- | tests/remote/Makefile | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/all.sh b/tests/all.sh index aeda4e30d..69969fba5 100755 --- a/tests/all.sh +++ b/tests/all.sh @@ -51,10 +51,10 @@ # pkix - run test suites with PKIX enabled # upgradedb - upgrade existing certificate databases to shareable # format (creates them if doesn't exist yet) and run -# test suites with those databases +# test suites with those databases. Requires to enable libdm. # sharedb - run test suites with shareable database format # enabled (databases are created directly to this -# format) +# format). This is the default and doesn't need to be run separately. # # Mandatory environment variables (to be set before testing): # ----------------------------------------------------------- @@ -135,7 +135,7 @@ run_tests() } ########################## run_cycle_standard ########################## -# run test suites with dbm database (no PKIX, no sharedb) +# run test suites with sql database (no PKIX) ######################################################################## run_cycle_standard() { @@ -144,7 +144,7 @@ run_cycle_standard() TESTS="${ALL_TESTS}" TESTS_SKIP="cipher libpkix sdr ocsp pkits" - NSS_DEFAULT_DB_TYPE="dbm" + NSS_DEFAULT_DB_TYPE=${NSS_DEFAULT_DB_TYPE:-"sql"} export NSS_DEFAULT_DB_TYPE run_tests @@ -288,7 +288,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then . ./init.sh fi -cycles="standard pkix upgradedb sharedb" +cycles="standard pkix" CYCLES=${NSS_CYCLES:-$cycles} NO_INIT_SUPPORT=`certutil --build-flags |grep -cw NSS_NO_INIT_SUPPORT` diff --git a/tests/common/init.sh b/tests/common/init.sh index 51c257773..658023d83 100644 --- a/tests/common/init.sh +++ b/tests/common/init.sh @@ -651,9 +651,9 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then RELOAD_CRL=1 - # if test mode isn't set, test scripts default to expecting dbm + # if test mode isn't set, test scripts default to expecting sql if [ "${TEST_MODE}" = "" ]; then - NSS_DEFAULT_DB_TYPE="dbm" + NSS_DEFAULT_DB_TYPE=${NSS_DEFAULT_DB_TYPE:-"sql"} export NSS_DEFAULT_DB_TYPE fi diff --git a/tests/remote/Makefile b/tests/remote/Makefile index 4635bccc5..5b0d5ec9e 100644 --- a/tests/remote/Makefile +++ b/tests/remote/Makefile @@ -56,7 +56,7 @@ ifeq ($(OS_TARGET),Android) TEST_SHELL?=$$HOME/bin/sh ANDROID_PORT?="2222" #Define the subset of tests that is known to work on Android -NSS_CYCLES?="standard pkix upgradedb sharedb" +NSS_CYCLES?="standard pkix sharedb" NSS_TESTS?="cipher lowhash libpkix cert dbtests tools sdr crmf smime ssl ocsp merge pkits chains" NSS_SSL_TESTS?="crl normal_normal iopr" NSS_SSL_RUN?="cov auth stress" |