summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Viironen <kalle.viironen@qt.io>2023-03-22 15:17:04 +0200
committerKalle Viironen <kalle.viironen@qt.io>2023-04-05 10:34:39 +0200
commit982f0a46571cca342ce7805f24f97a1d3e802383 (patch)
treeec0c8cd496db2b8b80af1927f10c1576f601eb1e
parent195a4383953c72cc64908c85ee978bb0c08b7e63 (diff)
downloadqt5-982f0a46571cca342ce7805f24f97a1d3e802383.tar.gz
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 <edward.welbourne@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh3
2 files changed, 5 insertions, 0 deletions
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