From: Peter Rabbitson Date: Fri, 31 Oct 2014 11:17:49 +0000 (+0100) Subject: (travis) Forgotten bit while reverting f207111d6 (goes with 0d383895) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5af542651c8fc99b9592f4effea6ea6b92b0afb2;p=dbsrgits%2FDBIx-Class.git (travis) Forgotten bit while reverting f207111d6 (goes with 0d383895) --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index 8ca7f97..830a291 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -111,6 +111,7 @@ run_or_err "Configure on current branch" "perl Makefile.PL" # install (remaining) dependencies, sometimes with a gentle push if [[ "$CLEANTEST" = "true" ]]; then + # we may need to prepend some stuff to that list HARD_DEPS="$(echo $(make listdeps))" @@ -146,47 +147,10 @@ if [[ "$CLEANTEST" = "true" ]]; then installdeps $HARD_DEPS -### FIXME in case we set it earlier in a workaround - if [[ -n "$HARNESS_SUBCLASS" ]] ; then - - INSTALLDEPS_SKIPPED_TESTLIST=$(perl -0777 -e ' -my $curmod_re = qr{ -^ - (?: - \QBuilding and testing\E - | - [\x20\t]* CPAN\.pm: [^\n]*? (?i:build)\S* - ) - - [\x20\t]+ (\S+) -$}mx; - -my $curskip_re = qr{^ === \x20 \QSkipping nonessential autogenerated tests: \E([^\n]+) }mx; - -my (undef, @chunks) = (split qr/$curmod_re/, <>); -while (@chunks) { - my ($mod, $log) = splice @chunks, 0, 2; - print "!!! Skipped nonessential tests while installing $mod:\n\t$1\n" - if $log =~ $curskip_re; -} -' <<< "$LASTOUT") - - if [[ -n "$INSTALLDEPS_SKIPPED_TESTLIST" ]] ; then - POSTMORTEM="$POSTMORTEM$( - echo - echo "The following non-essential tests were skipped during deps installation" - echo "=============================================================" - echo "$INSTALLDEPS_SKIPPED_TESTLIST" - echo "=============================================================" - echo - )" - fi - - unset HARNESS_SUBCLASS - fi - else + parallel_installdeps_notest "$(make listdeps)" + fi echo_err "$(tstamp) Dependency installation finished"