From a1af151124df05dd6307487dd06fc3c22525edab Mon Sep 17 00:00:00 2001
From: gjoranv <gjoranv@gmail.com>
Date: Thu, 12 Jul 2018 14:01:28 +0200
Subject: Reapply "Adding handler and binding when services.xml has
 <search>-field"

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23dcef6d96d..6c557179750 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ add_subdirectory(container-disc)
 add_subdirectory(container-jersey2)
 add_subdirectory(container-messagebus)
 add_subdirectory(container-search)
+add_subdirectory(container-search-gui)
 add_subdirectory(container-search-and-docproc)
 add_subdirectory(clustercontroller-apps)
 add_subdirectory(clustercontroller-apputil)
-- 
cgit v1.2.3


From 6413b8b0211f82643b19da16b8563388c39a919d Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@oath.com>
Date: Wed, 1 Aug 2018 11:07:11 +0000
Subject: Install valgrind suppressions file.

---
 CMakeLists.txt              |  2 ++
 functions.cmake             |  8 ++++++++
 vespabase/src/common-env.sh | 13 ++++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

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"
-- 
cgit v1.2.3