|
 |
83c154 |
# HG changeset patch
|
|
|
83c154 |
# User Franziskus Kiefer <franziskuskiefer@gmail.com>
|
|
|
83c154 |
# Date 1575483231 0
|
|
|
83c154 |
# Wed Dec 04 18:13:51 2019 +0000
|
|
|
83c154 |
# Node ID c1fad130dce2081a5d6ce9f539c72d999f59afce
|
|
|
83c154 |
# Parent a9ba652046e634ccb4ca21a43dd6d76858e20d62
|
|
|
83c154 |
Bug 1594933 - disable libnssdbm by default; keep build on CI, r=jcj
|
|
|
83c154 |
|
|
|
83c154 |
Disale libnssdbm by default and add flag to enable it in builds.
|
|
|
83c154 |
On CI a build and certs test with enabled legacy DB are added.
|
|
|
83c154 |
|
|
|
83c154 |
Note that for some reason the coverage build fails. I have no idea why. I'm open for ideas.
|
|
|
83c154 |
|
|
|
83c154 |
Differential Revision: https://phabricator.services.mozilla.com/D54673
|
|
|
83c154 |
|
|
|
83c154 |
diff -r a9ba652046e6 -r c1fad130dce2 tests/all.sh
|
|
|
83c154 |
--- a/tests/all.sh Tue Dec 03 23:27:28 2019 +0000
|
|
|
83c154 |
+++ b/tests/all.sh Wed Dec 04 18:13:51 2019 +0000
|
|
|
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
|
|
|
83c154 |
-# test suites with those databases
|
|
|
83c154 |
+# test suites with those databases. Requires to enable libdm.
|
|
|
83c154 |
# sharedb - run test suites with shareable database format
|
|
|
83c154 |
# enabled (databases are created directly to this
|
|
|
83c154 |
-# format)
|
|
|
83c154 |
+# format). This is the default and doesn't need to be run separately.
|
|
|
83c154 |
#
|
|
|
83c154 |
# Mandatory environment variables (to be set before testing):
|
|
|
83c154 |
# -----------------------------------------------------------
|
|
|
83c154 |
@@ -135,7 +135,7 @@
|
|
|
83c154 |
}
|
|
|
83c154 |
|
|
|
83c154 |
########################## run_cycle_standard ##########################
|
|
|
83c154 |
-# run test suites with dbm database (no PKIX, no sharedb)
|
|
|
83c154 |
+# run test suites with sql database (no PKIX)
|
|
|
83c154 |
########################################################################
|
|
|
83c154 |
run_cycle_standard()
|
|
|
83c154 |
{
|
|
|
83c154 |
@@ -144,7 +144,7 @@
|
|
|
83c154 |
TESTS="${ALL_TESTS}"
|
|
|
83c154 |
TESTS_SKIP="cipher libpkix sdr ocsp pkits"
|
|
|
83c154 |
|
|
|
83c154 |
- NSS_DEFAULT_DB_TYPE="dbm"
|
|
|
83c154 |
+ NSS_DEFAULT_DB_TYPE=${NSS_DEFAULT_DB_TYPE:-"sql"}
|
|
|
83c154 |
export NSS_DEFAULT_DB_TYPE
|
|
|
83c154 |
|
|
|
83c154 |
run_tests
|
|
|
83c154 |
@@ -288,7 +288,7 @@
|
|
|
83c154 |
. ./init.sh
|
|
|
83c154 |
fi
|
|
|
83c154 |
|
|
|
83c154 |
-cycles="standard pkix upgradedb sharedb"
|
|
|
83c154 |
+cycles="standard pkix"
|
|
|
83c154 |
CYCLES=${NSS_CYCLES:-$cycles}
|
|
|
83c154 |
|
|
|
83c154 |
NO_INIT_SUPPORT=`certutil --build-flags |grep -cw NSS_NO_INIT_SUPPORT`
|
|
|
83c154 |
diff -r a9ba652046e6 -r c1fad130dce2 tests/common/init.sh
|
|
|
83c154 |
--- a/tests/common/init.sh Tue Dec 03 23:27:28 2019 +0000
|
|
|
83c154 |
+++ b/tests/common/init.sh Wed Dec 04 18:13:51 2019 +0000
|
|
|
83c154 |
@@ -651,9 +651,9 @@
|
|
|
83c154 |
|
|
|
83c154 |
RELOAD_CRL=1
|
|
|
83c154 |
|
|
|
83c154 |
- # if test mode isn't set, test scripts default to expecting dbm
|
|
|
83c154 |
+ # if test mode isn't set, test scripts default to expecting sql
|
|
|
83c154 |
if [ "${TEST_MODE}" = "" ]; then
|
|
|
83c154 |
- NSS_DEFAULT_DB_TYPE="dbm"
|
|
|
83c154 |
+ NSS_DEFAULT_DB_TYPE=${NSS_DEFAULT_DB_TYPE:-"sql"}
|
|
|
83c154 |
export NSS_DEFAULT_DB_TYPE
|
|
|
83c154 |
fi
|
|
|
83c154 |
|
|
|
83c154 |
diff -r a9ba652046e6 -r c1fad130dce2 tests/remote/Makefile
|
|
|
83c154 |
--- a/tests/remote/Makefile Tue Dec 03 23:27:28 2019 +0000
|
|
|
83c154 |
+++ b/tests/remote/Makefile Wed Dec 04 18:13:51 2019 +0000
|
|
|
83c154 |
@@ -56,7 +56,7 @@
|
|
|
83c154 |
TEST_SHELL?=$$HOME/bin/sh
|
|
|
83c154 |
ANDROID_PORT?="2222"
|
|
|
83c154 |
#Define the subset of tests that is known to work on Android
|
|
|
83c154 |
-NSS_CYCLES?="standard pkix upgradedb sharedb"
|
|
|
83c154 |
+NSS_CYCLES?="standard pkix 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"
|