db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-12 10:04:14 +02:00
Code Issues Releases Activity

Update lcov to 1.14.

Browse Source 
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.
This commit is contained in:
David Steele 2019-10-12 11:24:21 -04:00
parent 11c7c8fabb
commit 93656db186
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/Vagrantfile vendored
View File

@ -67,9 +67,15 @@ Vagrant.configure(2) do |config|
#--------------------------------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------------------------------
echo 'Install Build Tools' && date 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 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 echo 'Install Docker' && date
curl -fsSL https://get.docker.com | sh curl -fsSL https://get.docker.com | sh

14
test/lib/pgBackRestTest/Common/ContainerTest.pm
View File

@ -361,7 +361,7 @@ sub containerBuild
" yum -y install openssh-server openssh-clients wget sudo valgrind git \\\n" . " yum -y install openssh-server openssh-clients wget sudo valgrind git \\\n" .
" perl perl-Digest-SHA perl-DBD-Pg perl-YAML-LibYAML openssl \\\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" . " 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) if ($strOS eq VM_CO6)
{ {
@ -380,7 +380,7 @@ sub containerBuild
" apt-get -y install openssh-server wget sudo gcc make valgrind git \\\n" . " apt-get -y install openssh-server wget sudo gcc make valgrind git \\\n" .
" libdbd-pg-perl libhtml-parser-perl libssl-dev libperl-dev \\\n" . " libdbd-pg-perl libhtml-parser-perl libssl-dev libperl-dev \\\n" .
" libyaml-libyaml-perl tzdata devscripts lintian libxml-checker-perl txt2man debhelper \\\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) if ($strOS eq VM_U12)
{ {
@ -430,6 +430,16 @@ sub containerBuild
$strScript .= certSetup($strOS); $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) if (!$bDeprecated)
{ {