summaryrefslogtreecommitdiffstats
path: root/security/nss/tests/common
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-06 11:46:26 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-06 11:46:26 +0100
commitf017b749ea9f1586d2308504553d40bf4cc5439d (patch)
treec6033924a0de9be1ab140596e305898c651bf57e /security/nss/tests/common
parent7c728b3c7680662fc4e92b5d03697b8339560b08 (diff)
downloadUXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.gz
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.lz
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.xz
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.zip
Update NSS to 3.32.1-RTM
Diffstat (limited to 'security/nss/tests/common')
-rwxr-xr-xsecurity/nss/tests/common/cleanup.sh3
-rw-r--r--security/nss/tests/common/init.sh6
-rw-r--r--security/nss/tests/common/parsegtestreport.sed1
3 files changed, 5 insertions, 5 deletions
diff --git a/security/nss/tests/common/cleanup.sh b/security/nss/tests/common/cleanup.sh
index 40d8bc40f..40885bc79 100755
--- a/security/nss/tests/common/cleanup.sh
+++ b/security/nss/tests/common/cleanup.sh
@@ -27,6 +27,9 @@ if [ -z "${CLEANUP}" -o "${CLEANUP}" = "${SCRIPTNAME}" ]; then
echo "NSS_AIA_OCSP=${NSS_AIA_OCSP}"
echo "IOPR_HOSTADDR_LIST=${IOPR_HOSTADDR_LIST}"
echo "PKITS_DATA=${PKITS_DATA}"
+ echo "NSS_DISABLE_HW_AES=${NSS_DISABLE_HW_AES}"
+ echo "NSS_DISABLE_PCLMUL=${NSS_DISABLE_PCLMUL}"
+ echo "NSS_DISABLE_AVX=${NSS_DISABLE_AVX}"
echo
echo "Tests summary:"
echo "--------------"
diff --git a/security/nss/tests/common/init.sh b/security/nss/tests/common/init.sh
index 3598e8223..caf3013e6 100644
--- a/security/nss/tests/common/init.sh
+++ b/security/nss/tests/common/init.sh
@@ -180,9 +180,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
}
increase_msg_id()
{
- MSG_ID=`cat ${MSG_ID_FILE}`
- MSG_ID=`expr ${MSG_ID} + 1`
- echo ${MSG_ID} > ${MSG_ID_FILE}
+ MSG_ID=$(( ${MSG_ID} + 1 ))
}
html_passed_ignore_core()
{
@@ -645,9 +643,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
NSS_DEFAULT_DB_TYPE="dbm"
export NSS_DEFAULT_DB_TYPE
- MSG_ID_FILE="${HOSTDIR}/id"
MSG_ID=0
- echo ${MSG_ID} > ${MSG_ID_FILE}
#################################################
# Interoperability testing constatnts
diff --git a/security/nss/tests/common/parsegtestreport.sed b/security/nss/tests/common/parsegtestreport.sed
index d7c6ddada..11bd1d6af 100644
--- a/security/nss/tests/common/parsegtestreport.sed
+++ b/security/nss/tests/common/parsegtestreport.sed
@@ -6,3 +6,4 @@
}
d
: end
+s/&quot;/"/g