From: Peter Rabbitson Date: Sun, 8 Sep 2013 15:23:14 +0000 (+0200) Subject: Check that each preinstall on an old CPAN.pm completes X-Git-Tag: v0.08260~162 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2b8f2982011353b3010da61589825ada03d410f5;p=dbsrgits%2FDBIx-Class.git Check that each preinstall on an old CPAN.pm completes --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index 056ae88..ab57e55 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -44,13 +44,20 @@ if [[ "$CLEANTEST" = "true" ]]; then if ! CPAN_is_sane ; then for m in ExtUtils::MakeMaker ExtUtils::CBuilder R/RS/RSAVAGE/Tree-DAG_Node-1.13.tgz Module::Build ; do run_or_err "Pre-installing $m" "cpan $m" + if ! perl -e ' + +eval ( q{require } . ( + $ARGV[0] =~ m{ \/ .*? ([^\/]+) $ }x + ? do { my @p = split (/\-/, $1); pop @p; join "::", @p } + : $ARGV[0] +) ) or ( print $@ and exit 1)' "$m" 2> /dev/null ; then + + echo_err -e "$m installation failed\n$LASTOUT" + exit 1 + fi done fi - if ! perl -MModule::Build -e 1 &> /dev/null ; then - echo_err -e "Module::Build installation failed\n$LASTOUT" - exit 1 - fi # DBI has by far the longest test runtime - run less tests # FIXME horrible horrible hack, need to implement in DBI itself