Commit 25acbeb6 authored by Tim Taubert's avatar Tim Taubert

Bug 1330944 - GYP: Don't require Valgrind (ct_verif) for -Dtest_build=1 r=mt

Differential Revision: https://nss-review.dev.mozaws.net/D149

--HG--
extra : amend_source : f272a956650b66b9caec9df65e82711290c9c49a
parent a0a101ce
......@@ -19,9 +19,6 @@ apt_packages+=('ninja-build')
apt_packages+=('pkg-config')
apt_packages+=('zlib1g-dev')
# ct-verif and sanitizers
apt_packages+=('valgrind')
# Latest Mercurial.
apt_packages+=('mercurial')
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 41BD8711B1F0EC2B0D85B91CF59CE3A8323293EE
......
......@@ -368,7 +368,7 @@ async function scheduleTestBuilds() {
"/bin/bash",
"-c",
"bin/checkout.sh && " +
"nss/automation/taskcluster/scripts/build_gyp.sh -g -v --test"
"nss/automation/taskcluster/scripts/build_gyp.sh -g -v --test --ct-verif"
],
artifacts: {
public: {
......
......@@ -36,6 +36,7 @@ NSS build tool options:
--test ignore map files and export everything we have
--fuzz enable fuzzing mode. this always enables test builds
--pprof build with gperftool support
--ct-verif build with valgrind for ct-verif
--scan-build run the build with scan-build (scan-build has to be in the path)
--scan-build=/out/path sets the output path for scan-build
--asan do an asan build
......@@ -103,6 +104,7 @@ while [ $# -gt 0 ]; do
--sancov) enable_sancov ;;
--sancov=?*) enable_sancov "${1#*=}" ;;
--pprof) gyp_params+=(-Duse_pprof=1) ;;
--ct-verif) gyp_params+=(-Dct_verif=1) ;;
*) show_help; exit 2 ;;
esac
shift
......
......@@ -105,6 +105,7 @@
'fuzz%': 0,
'sign_libs%': 1,
'use_pprof%': 0,
'ct_verif%': 0,
'nss_public_dist_dir%': '<(nss_dist_dir)/public',
'nss_private_dist_dir%': '<(nss_dist_dir)/private',
},
......
......@@ -19,8 +19,12 @@
'<(DEPTH)/lib/freebl/freebl.gyp:<(freebl_name)',
'<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
],
'defines': [
'CT_VERIF',
'conditions': [
[ 'ct_verif==1', {
'defines': [
'CT_VERIF',
],
}],
],
}
],
......
......@@ -83,8 +83,10 @@ TEST_F(MPITest, MpiCmpConstTest) {
"FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632550"),
16);
#ifdef CT_VERIF
mp_taint(&b);
mp_taint(&c);
#endif
uint32_t runs = 5000000;
uint32_t time_b = 0, time_c = 0;
......
......@@ -233,7 +233,7 @@
'UNSAFE_FUZZER_MODE',
],
}],
[ 'test_build==1', {
[ 'ct_verif==1', {
'defines': [
'CT_VERIF',
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment