From 982f0a46571cca342ce7805f24f97a1d3e802383 Mon Sep 17 00:00:00 2001 From: Kalle Viironen Date: Wed, 22 Mar 2023 15:17:04 +0200 Subject: Provisioning: Install Valgrind on Ubuntu 22.04 and openSUSE 15.4 Valgrind is needed for testlib benchlibcallgrind selftest. Valgrind is installed on Red Hat by default but needs to be separately installed on Ubuntu and openSUSE. Change-Id: I4cdfca512fe3efe9338a75cadc20454ff989fcae Reviewed-by: Edward Welbourne Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 2 ++ coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh | 3 +++ 2 files changed, 5 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh index 26cacccc..7aded771 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh @@ -211,6 +211,8 @@ installPackages+=(libpoppler-cpp-dev) # Needed for QtCore installPackages+=(libdouble-conversion-dev) installPackages+=(libpcre2-dev) +# Needed for testlib selftests +installPackages+=(valgrind) # Needed for qtgampepad installPackages+=(libsdl2-2.0) installPackages+=(libsdl2-dev) diff --git a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh index 88eab2d7..487d4607 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh @@ -96,6 +96,9 @@ sudo zypper -nq install autoconf libcurl-devel libexpat-devel # OpenSSL 3 sudo zypper -nq install openssl-3 +# Valgrind (Needed for testlib selftests) +sudo zypper -nq install valgrind-devel + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt -- cgit v1.2.1