From: Peter Rabbitson Date: Mon, 14 Oct 2013 12:12:06 +0000 (+0200) Subject: Remove anything preinstalled on the travis perls when CLEANTEST is true X-Git-Tag: v0.08260~108 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=commitdiff_plain;h=2c754d148ed138ccdbb150dfac75b707765de599 Remove anything preinstalled on the travis perls when CLEANTEST is true This will give us yet another test point --- diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash index fa50ffc..b582b34 100755 --- a/maint/travis-ci_scripts/10_before_install.bash +++ b/maint/travis-ci_scripts/10_before_install.bash @@ -13,7 +13,7 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi # `processor : XX` line export NUMTHREADS=$(( $(perl -0777 -n -e 'print (/ (?: .+ ^ processor \s+ : \s+ (\d+) ) (?! ^ processor ) /smx)' < /proc/cpuinfo) + 1 )) -run_or_err "Installing App::Nopaste from APT" "sudo apt-get install --allow-unauthenticated -y libapp-nopaste-perl" +run_or_err "Installing common tools from APT" "sudo apt-get install --allow-unauthenticated -y libapp-nopaste-perl tree" # FIXME - the debian package is oddly broken - uses a bin/env based shebang # so nothing works under a brew. Fix here until #debian-perl patches it up sudo /usr/bin/perl -p -i -e 's|#!/usr/bin/env perl|#!/usr/bin/perl|' $(which nopaste) diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash index 7c19a56..bb7f414 100755 --- a/maint/travis-ci_scripts/20_install.bash +++ b/maint/travis-ci_scripts/20_install.bash @@ -54,6 +54,27 @@ if [[ -n "$BREWVER" ]] ; then exit 1 fi +# no brewver - this means a travis perl, which means we want to clean up +# the presently installed libs +# Idea stolen from +# https://github.com/kentfredric/Dist-Zilla-Plugin-Prereqs-MatchInstalled-All/blob/master/maint-travis-ci/sterilize_env.pl +elif [[ "$CLEANTEST" == "true" ]] && [[ "$POISON_ENV" != "true" ]] ; then + + echo_err "$(tstamp) Cleaning precompiled Travis-Perl" + perl -MConfig -MFile::Find -e ' + my $sitedirs = { + map { $Config{$_} => 1 } + grep { $_ =~ /site(lib|arch)exp$/ } + keys %Config + }; + find({ bydepth => 1, no_chdir => 1, follow_fast => 1, wanted => sub { + ! $sitedirs->{$_} and ( -d _ ? rmdir : unlink ) + } }, keys %$sitedirs ) + ' + + echo_err "Post-cleanup contents of sitelib of the pre-compiled Travis-Perl $TRAVIS_PERL_VERSION:" + echo_err "$(tree $(perl -MConfig -e 'print $Config{sitelib_stem}'))" + echo_err fi # configure CPAN.pm - older versions go into an endless loop