summaryrefslogtreecommitdiff
path: root/tests/ssl_gtests
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2015-10-16 13:29:48 -0700
committerMartin Thomson <martin.thomson@gmail.com>2015-10-16 13:29:48 -0700
commitd257873834b58da618705a8ba25bc261c7b8b1a9 (patch)
tree94ab2f971f33b02d562314833131eac51245d0a8 /tests/ssl_gtests
parentefbb88050e434738835501dd3ea51926f7a639e5 (diff)
downloadnss-hg-d257873834b58da618705a8ba25bc261c7b8b1a9.tar.gz
Bug 1214390 - Fixing compilation errors on Windows, r=ekr,wtc
Diffstat (limited to 'tests/ssl_gtests')
-rwxr-xr-xtests/ssl_gtests/ssl_gtests.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/ssl_gtests/ssl_gtests.sh b/tests/ssl_gtests/ssl_gtests.sh
index ad3d4448d..f57ef95ee 100755
--- a/tests/ssl_gtests/ssl_gtests.sh
+++ b/tests/ssl_gtests/ssl_gtests.sh
@@ -105,6 +105,8 @@ ssl_gtest_start()
return
fi
+ # Temporarily disable asserts for PKCS#11 slot leakage (Bug 1168425)
+ unset NSS_STRICT_SHUTDOWN
SSLGTESTREPORT="${SSLGTESTDIR}/report.xml"
${BINDIR}/ssl_gtest -d "${SSLGTESTDIR}" --gtest_output=xml:"${SSLGTESTREPORT}"
html_msg $? 0 "ssl_gtest run successfully"
@@ -120,6 +122,14 @@ ssl_gtest_start()
done
}
+ssl_gtest_cleanup()
+{
+ cd ${QADIR}
+ . common/cleanup.sh
+}
+
################## main #################################################
+cd "$(dirname "$0")"
ssl_gtest_init
ssl_gtest_start
+ssl_gtest_cleanup