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 | |
| parent | ccf197e50ef375abf16a879f2c66ea020609bcf4 (diff) | |
Install valgrind suppressions file.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | functions.cmake | 8 | ||||
| -rwxr-xr-x | vespabase/src/common-env.sh | 13 |
3 files changed, 22 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c557179750..3961fd2a4ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,8 @@ include(build_settings.cmake) # Enable CTest unit testing enable_testing() +vespa_install_data(valgrind-suppressions.txt etc/vespa) + # Include vespa config definitions in every target include_directories(BEFORE ${CMAKE_BINARY_DIR}/configdefinitions/src) diff --git a/functions.cmake b/functions.cmake index c0e07c1d362..f0dd5a31949 100644 --- a/functions.cmake +++ b/functions.cmake @@ -422,6 +422,14 @@ function(vespa_install_script) endif() endfunction() +function(vespa_install_data) + if(ARGC GREATER 2) + install(FILES ${ARGV0} RENAME ${ARGV1} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ DESTINATION ${ARGV2}) + else() + install(FILES ${ARGV0} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ DESTINATION ${ARGV1}) + endif() +endfunction() + function(vespa_workaround_gcc_bug_67055 SOURCE_FILE) if(CMAKE_COMPILER_IS_GNUCC) execute_process(COMMAND ${CMAKE_CPP_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) 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" |