summaryrefslogtreecommitdiff
path: root/nss/tests/common
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@lorry>2017-06-08 10:53:01 +0000
committerLorry Tar Creator <lorry-tar-importer@lorry>2017-06-08 10:53:01 +0000
commitf95d45c36e7c7131747259956821d844e8952e5d (patch)
treeeee14f8b212c48f8597c2a4927a167fcc3a15ea5 /nss/tests/common
parentdc1565216a5d20ae0d75872151523252309a1292 (diff)
downloadnss-master.tar.gz
Diffstat (limited to 'nss/tests/common')
-rwxr-xr-xnss/tests/common/cleanup.sh3
-rw-r--r--nss/tests/common/init.sh6
-rw-r--r--nss/tests/common/parsegtestreport.sed1
3 files changed, 5 insertions, 5 deletions
diff --git a/nss/tests/common/cleanup.sh b/nss/tests/common/cleanup.sh
index 40d8bc4..40885bc 100755
--- a/nss/tests/common/cleanup.sh
+++ b/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/nss/tests/common/init.sh b/nss/tests/common/init.sh
index 3598e82..caf3013 100644
--- a/nss/tests/common/init.sh
+++ b/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/nss/tests/common/parsegtestreport.sed b/nss/tests/common/parsegtestreport.sed
index d7c6dda..11bd1d6 100644
--- a/nss/tests/common/parsegtestreport.sed
+++ b/nss/tests/common/parsegtestreport.sed
@@ -6,3 +6,4 @@
}
d
: end
+s/&quot;/"/g