From 4b1d995bbacac8baebd8a71045d87a2126ad851b Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 26 Mar 2020 22:20:09 -0400 Subject: [PATCH] Update packages required for each CI job. Documentation builds and tests have only a few packages in common so rearrange packages to save some time and clarify dependencies. Remove the libperl-dev package which became obsolete when the LibC module was removed in 79cfd3ae. Add a few comments for good measure. --- test/travis.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/travis.pl b/test/travis.pl index c481ede17..b30bebae6 100755 --- a/test/travis.pl +++ b/test/travis.pl @@ -133,10 +133,7 @@ eval processBegin('install common packages'); processExec('sudo apt-get -qq update', {bSuppressStdErr => true, bSuppressError => true}); - processExec( - 'sudo apt-get install -y rsync zlib1g-dev libssl-dev libxml2-dev libpq-dev libxml-checker-perl libyaml-libyaml-perl' . - ' pkg-config', - {bSuppressStdErr => true}); + processExec('sudo apt-get install -y libxml-checker-perl libyaml-libyaml-perl', {bSuppressStdErr => true}); processEnd(); processBegin('mount tmpfs'); @@ -178,17 +175,20 @@ eval elsif ($ARGV[0] eq 'test') { # Build list of packages that need to be installed - my $strPackage = "libperl-dev"; + my $strPackage = "rsync zlib1g-dev libssl-dev libxml2-dev libpq-dev pkg-config"; + # Add lcov when testing coverage if (vmCoverageC($strVm)) { $strPackage .= " lcov"; } + # Extra packages required when testing without containers if ($strVm eq VM_NONE) { $strPackage .= " valgrind liblz4-dev liblz4-tool"; } + # Else packages needed for integration tests on containers else { $strPackage .= " libdbd-pg-perl";