diff options
| author | Tor Egge <Tor.Egge@oath.com> | 2018-08-01 11:07:11 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@oath.com> | 2018-08-01 11:20:23 +0000 |
| commit | 6413b8b0211f82643b19da16b8563388c39a919d (patch) | |
| tree | b1691d928895dd9843f7b5717a7ca0cce78d0ec2 /vespabase | |
| parent | ccf197e50ef375abf16a879f2c66ea020609bcf4 (diff) | |
Install valgrind suppressions file.
Diffstat (limited to 'vespabase')
| -rwxr-xr-x | vespabase/src/common-env.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index 8dfcf8d2c4c..018630b0622 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -107,6 +107,13 @@ populate_environment () { fi } +add_valgrind_suppressions_file() { + if [ -f "$1" ] + then + VESPA_VALGRIND_SUPPREESSIONS_OPT="$VESPA_VALGRIND_SUPPREESSIONS_OPT --suppressions=$1" + fi +} + populate_environment PATH=$VESPA_HOME/bin64:$VESPA_HOME/bin:/usr/local/bin:/usr/X11R6/bin:/sbin:/bin:/usr/sbin:/usr/bin @@ -119,13 +126,17 @@ if [ "$JAVA_HOME" ] && [ -f "${JAVA_HOME}/bin/java" ]; then PATH="${PATH}:${JAVA_HOME}/bin" fi +VESPA_VALGRIND_SUPPREESSIONS_OPT="" +add_valgrind_suppressions_file ${VESPA_HOME}/etc/vespa/valgrind-suppressions.txt +add_valgrind_suppressions_file ${VESPA_HOME}/etc/vespa/suppressions.txt + consider_fallback VESPA_VALGRIND_OPT "--num-callers=32 \ --run-libc-freeres=yes \ --track-origins=yes \ --freelist-vol=1000000000 \ --leak-check=full \ --show-reachable=yes \ ---suppressions=${VESPA_HOME}/etc/vespa/suppressions.txt" +${VESPA_VALGRIND_SUPPREESSIONS_OPT}" consider_fallback VESPA_USE_HUGEPAGES_LIST $(get_var "hugepages_list") consider_fallback VESPA_USE_HUGEPAGES_LIST "all" |