From 0af5e31282841b991fbc4822e8628bdf199a445a Mon Sep 17 00:00:00 2001 From: Taylor Hornby Date: Wed, 18 May 2016 18:39:40 -0600 Subject: [PATCH] Pass -DPURIFY to OpenSSL so it doesn't clutter valgrind output. --- depends/packages/openssl.mk | 1 + qa/zcash/performance-measurements.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index 687aae66..403c2662 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -10,6 +10,7 @@ $(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/o $(package)_config_opts+=no-krb5 no-camellia no-capieng no-cast no-cms no-dtls1 no-gost no-gmp no-heartbeats no-idea no-jpake no-md2 $(package)_config_opts+=no-mdc2 no-rc5 no-rdrand no-rfc3779 no-rsax no-sctp no-seed no-sha0 no-static_engine no-whirlpool no-rc2 no-rc4 no-ssl2 no-ssl3 $(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags) +$(package)_config_opts+=-DPURIFY $(package)_config_opts_linux=-fPIC -Wa,--noexecstack $(package)_config_opts_x86_64_linux=linux-x86_64 $(package)_config_opts_i686_linux=linux-generic32 diff --git a/qa/zcash/performance-measurements.sh b/qa/zcash/performance-measurements.sh index 048d3180..425a4eaf 100755 --- a/qa/zcash/performance-measurements.sh +++ b/qa/zcash/performance-measurements.sh @@ -38,7 +38,7 @@ function zcashd_valgrind_start { rm -rf "$DATADIR" mkdir -p "$DATADIR" rm -f valgrind.out - valgrind --leak-check=yes --log-file="valgrind.out" ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 & + valgrind --leak-check=yes --error-limit=no --log-file="valgrind.out" ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 & ZCASHD_PID=$! }