diff options
| author | Dana Keeler <dkeeler@mozilla.com> | 2019-11-01 22:36:25 +0000 |
|---|---|---|
| committer | Dana Keeler <dkeeler@mozilla.com> | 2019-11-01 22:36:25 +0000 |
| commit | 7504c2347f4f7779873f31b9e282e66417fcb8ea (patch) | |
| tree | 84c7144d1ce5daf169db70a04e04f58a2e057d5e /tests/gtests | |
| parent | b020fbb031f00bb2ee7fe57b1e1ff3af291b2106 (diff) | |
| download | nss-hg-7504c2347f4f7779873f31b9e282e66417fcb8ea.tar.gz | |
Bug 1588567 - enable mozilla::pkix gtests in NSS r=jcj
Differential Revision: https://phabricator.services.mozilla.com/D49184
Diffstat (limited to 'tests/gtests')
| -rwxr-xr-x | tests/gtests/gtests.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/gtests/gtests.sh b/tests/gtests/gtests.sh index 2b45e1ccd..53a7258c4 100755 --- a/tests/gtests/gtests.sh +++ b/tests/gtests/gtests.sh @@ -64,8 +64,14 @@ gtest_start() pushd "$DIR" GTESTREPORT="$DIR/report.xml" PARSED_REPORT="$DIR/report.parsed" + # The mozilla::pkix gtests cause an ODR violation that we ignore. + # See bug 1588567. + if [ "$i" = "mozpkix_gtest" ]; then + EXTRA_ASAN_OPTIONS="detect_odr_violation=0" + fi echo "executing $i" - "${BINDIR}/$i" "${SOURCE_DIR}/gtests/freebl_gtest/kat/Hash_DRBG.rsp" \ + 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" @@ -93,7 +99,7 @@ gtest_cleanup() } ################## main ################################################# -GTESTS="${GTESTS:-prng_gtest certhigh_gtest certdb_gtest der_gtest pk11_gtest util_gtest freebl_gtest softoken_gtest sysinit_gtest blake2b_gtest smime_gtest}" +GTESTS="${GTESTS:-prng_gtest certhigh_gtest certdb_gtest der_gtest pk11_gtest util_gtest freebl_gtest softoken_gtest sysinit_gtest blake2b_gtest smime_gtest mozpkix_gtest}" gtest_init "$0" gtest_start gtest_cleanup |