diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:02:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:02:47 +0100 |
| commit | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (patch) | |
| tree | c6033924a0de9be1ab140596e305898c651bf57e /security/nss/tests/common | |
| parent | 7c9b585349c985df0cf6ace83da5dadba8b5c677 (diff) | |
| parent | f017b749ea9f1586d2308504553d40bf4cc5439d (diff) | |
| download | UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.gz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.lz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.xz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.zip | |
Merge pull request #13 from MoonchildProductions/ported-upstream
Ported upstream
Diffstat (limited to 'security/nss/tests/common')
| -rwxr-xr-x | security/nss/tests/common/cleanup.sh | 3 | ||||
| -rw-r--r-- | security/nss/tests/common/init.sh | 6 | ||||
| -rw-r--r-- | security/nss/tests/common/parsegtestreport.sed | 1 |
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/"/"/g |