Streamline connection codepath, fix $ENV{DBI_DSN} regression from d87929a4

[dbsrgits/DBIx-Class.git] / maint / travis-ci_scripts / 20_install.bash

diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash
index 7c19a56..a05823d 100755 (executable)
--- a/maint/travis-ci_scripts/20_install.bash
+++ b/maint/travis-ci_scripts/20_install.bash
@@ -12,7 +12,7 @@ if ! [[ "$CPAN_MIRROR" =~ "http://" ]] ; then
   echo_err "Using $CPAN_MIRROR for the time being"
 fi
 
-export PERL_MM_USE_DEFAULT=1 PERL_MM_NONINTERACTIVE=1 PERL_AUTOINSTALL_PREFER_CPAN=1 PERLBREW_CPAN_MIRROR="$CPAN_MIRROR"
+export PERL_MM_USE_DEFAULT=1 PERL_MM_NONINTERACTIVE=1 PERL_AUTOINSTALL_PREFER_CPAN=1 PERLBREW_CPAN_MIRROR="$CPAN_MIRROR" HARNESS_TIMER=1 MAKEFLAGS="-j$NUMTHREADS"
 
 # try CPAN's latest offering if requested
 if [[ "$DEVREL_DEPS" == "true" ]] ; then
@@ -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