From 11925d05e802a578ee2934924483a5f22951bd0e Mon Sep 17 00:00:00 2001
From: Kevin Jacobs <kjacobs@mozilla.com>
Date: Wed, 13 Jan 2021 02:33:06 +0000
Subject: Bug 1684300 - Disable legacy storage when compiled with
 NSS_DISABLE_DBM. r=mt

Differential Revision: https://phabricator.services.mozilla.com/D101218
---
 tests/gtests/gtests.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'tests')

diff --git a/tests/gtests/gtests.sh b/tests/gtests/gtests.sh
index 50c0410f0..4005a16a6 100755
--- a/tests/gtests/gtests.sh
+++ b/tests/gtests/gtests.sh
@@ -68,12 +68,23 @@ gtest_start()
     if [ "$i" = "mozpkix_gtest" ]; then
       EXTRA_ASAN_OPTIONS="detect_odr_violation=0"
     fi
+    # NSS CI sets a lower max for PBE iterations, otherwise cert.sh
+    # is very slow. Unset this maxiumum for softoken_gtest, as it
+    # needs to check the default value.
+    if [ "$i" = "softoken_gtest" ]; then
+      OLD_MAX_PBE_ITERATIONS=$NSS_MAX_MP_PBE_ITERATION_COUNT
+      unset NSS_MAX_MP_PBE_ITERATION_COUNT
+    fi
     echo "executing $i"
     ASAN_OPTIONS="$ASAN_OPTIONS:$EXTRA_ASAN_OPTIONS" "${BINDIR}/$i" \
                  "${SOURCE_DIR}/gtests/freebl_gtest/kat/Hash_DRBG.rsp" \
                  -d "$DIR" -w --gtest_output=xml:"${GTESTREPORT}" \
                               --gtest_filter="${GTESTFILTER:-*}"
     html_msg $? 0 "$i run successfully"
+    if [ "$i" = "softoken_gtest" ]; then
+      export NSS_MAX_MP_PBE_ITERATION_COUNT=$OLD_MAX_PBE_ITERATIONS
+    fi
+
     echo "test output dir: ${GTESTREPORT}"
     echo "executing sed to parse the xml report"
     sed -f "${COMMON}/parsegtestreport.sed" "$GTESTREPORT" > "$PARSED_REPORT"
-- 
cgit v1.2.1