From 93656db186e6da286bd704dc65235fcc209bb19d Mon Sep 17 00:00:00 2001 From: David Steele Date: Sat, 12 Oct 2019 11:24:21 -0400 Subject: [PATCH] Update lcov to 1.14. 1.13 is not compatible with gcc 8 which is what ships with newer distributions. Build from source to get a more recent version. 1.13 is not compatible with gcc 9 so we'll need to address that at a later date. --- test/Vagrantfile | 8 +++++++- test/lib/pgBackRestTest/Common/ContainerTest.pm | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/test/Vagrantfile b/test/Vagrantfile index e3884dc1b..5ec134c8b 100644 --- a/test/Vagrantfile +++ b/test/Vagrantfile @@ -67,9 +67,15 @@ Vagrant.configure(2) do |config| #--------------------------------------------------------------------------------------------------------------------------- echo 'Install Build Tools' && date - apt-get install -y devscripts build-essential lintian git lcov cloc txt2man debhelper libssl-dev zlib1g-dev libperl-dev \ + apt-get install -y devscripts build-essential lintian git cloc txt2man debhelper libssl-dev zlib1g-dev libperl-dev \ libxml2-dev liblz4-dev libpq-dev valgrind + #--------------------------------------------------------------------------------------------------------------------------- + echo 'Build lcov' && date + wget -q -O - https://github.com/linux-test-project/lcov/releases/download/v1.14/lcov-1.14.tar.gz | tar zx -C /root + make -q -C /root/lcov-1.14 install + rm -rf /root/lcov-1.14 + #--------------------------------------------------------------------------------------------------------------------------- echo 'Install Docker' && date curl -fsSL https://get.docker.com | sh diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm index c95266fdc..4246c4d62 100755 --- a/test/lib/pgBackRestTest/Common/ContainerTest.pm +++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm @@ -361,7 +361,7 @@ sub containerBuild " yum -y install openssh-server openssh-clients wget sudo valgrind git \\\n" . " perl perl-Digest-SHA perl-DBD-Pg perl-YAML-LibYAML openssl \\\n" . " gcc make perl-ExtUtils-MakeMaker perl-Test-Simple openssl-devel perl-ExtUtils-Embed rpm-build \\\n" . - " zlib-devel libxml2-devel lz4-devel lcov"; + " zlib-devel libxml2-devel lz4-devel"; if ($strOS eq VM_CO6) { @@ -380,7 +380,7 @@ sub containerBuild " apt-get -y install openssh-server wget sudo gcc make valgrind git \\\n" . " libdbd-pg-perl libhtml-parser-perl libssl-dev libperl-dev \\\n" . " libyaml-libyaml-perl tzdata devscripts lintian libxml-checker-perl txt2man debhelper \\\n" . - " libppi-html-perl libtemplate-perl libtest-differences-perl zlib1g-dev libxml2-dev lcov"; + " libppi-html-perl libtemplate-perl libtest-differences-perl zlib1g-dev libxml2-dev"; if ($strOS eq VM_U12) { @@ -430,6 +430,16 @@ sub containerBuild $strScript .= certSetup($strOS); + #--------------------------------------------------------------------------------------------------------------------------- + my $strLCovPath = '/root/lcov-1.14'; + + $strScript .= sectionHeader() . + "# Build lcov\n" . + " wget -q -O - https://github.com/linux-test-project/lcov/releases/download/v1.14/lcov-1.14.tar.gz" . + " | tar zx -C /root && \\\n" . + " make -C ${strLCovPath} install && \\\n" . + " rm -rf ${strLCovPath}"; + #--------------------------------------------------------------------------------------------------------------------------- if (!$bDeprecated) {