From: Peter Rabbitson Date: Tue, 9 Jun 2015 23:48:26 +0000 (+0200) Subject: (travis) Double check M::B::T is not pulled in (related to a872a9d7) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=113087b70fdd216a3ac53afcd0e5e691c5223224;p=dbsrgits%2FDBIx-Class.git (travis) Double check M::B::T is not pulled in (related to a872a9d7) --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index a2b96cc..1bd8837 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -159,6 +159,10 @@ if [[ "$POISON_ENV" = "true" ]] && ( perl -MDBD::SQLite\ 1.38 -e1 || perl -MDBI\ exit 1 fi +if [[ "$CLEANTEST" = "true" ]] && perl -MModule::Build::Tiny -e1 &>/dev/null ; then + echo_err "Module::Build::Tiny pulled in during the basic depchain install - this must not happen" + exit 1 +fi # announce what are we running echo_err " diff --git a/maint/travis-ci_scripts/common.bash b/maint/travis-ci_scripts/common.bash index 0faf8a5..f890965 100755 --- a/maint/travis-ci_scripts/common.bash +++ b/maint/travis-ci_scripts/common.bash @@ -253,9 +253,14 @@ purge_sitelib() { { (my $mp = $_ . ".pm" ) =~ s|::|/|g; $mp } grep { $mcl_source !~ / ^ \s+ \x27 $_ \x27 \s* \=\> /mx } - keys %{ DBIx::Class::Optional::Dependencies->modreq_list_for([ - keys %{ DBIx::Class::Optional::Dependencies->req_group_list } - ])} + ( + qw( + Module::Build::Tiny + ), + keys %{ DBIx::Class::Optional::Dependencies->modreq_list_for([ + keys %{ DBIx::Class::Optional::Dependencies->req_group_list } + ])} + ) ; # now that we have the list we can go ahead and destroy every single one