Do one poisoned env testrun with a threaded perl

[dbsrgits/DBIx-Class.git] / maint / travis-ci_scripts / 30_before_script.bash

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index 63ac1c0..4cca4ab 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -7,24 +7,17 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 # ENVvars and set them to true and see if anything explodes
 if [[ "$POISON_ENV" = "true" ]] ; then
   for var in $(grep -P '\$ENV\{' -r lib/ | grep -oP 'DBIC_\w+' | sort -u | grep -v DBIC_TRACE) ; do
-    export $var=1
+    if [[ -z "${!var}" ]] ; then
+      export $var=1
+    fi
   done
 
   export DBI_DSN="dbi:ODBC:server=NonexistentServerAddress"
   export DBI_DRIVER="ADO"
 
   export DBICTEST_SQLITE_REVERSE_DEFAULT_ORDER=1
-elif [[ "$CLEANTEST" != "true" ]] && ( [[ -z "$BREWVER" ]] || [[ "$BREWVER" = "blead" ]] ) ; then
-  # try CPAN's latest offering on a stock perl and a threaded blead
-  # can't do this with CLEANTEST=true yet because a lot of our deps fail
-  # tests left and right under T::B 1.5
-  PERL_CPANM_OPT="$PERL_CPANM_OPT --dev"
-
-  # FIXME work around https://github.com/miyagawa/cpanminus/issues/308
-  TEST_BUILDER_BETA_CPAN_TARBALL="M/MS/MSCHWERN/Test-Simple-1.005000_006.tar.gz"
 fi
 
-
 if [[ "$CLEANTEST" = "true" ]]; then
   # get the last inc/ off cpan - we will get rid of MI
   # soon enough, but till then this will do
@@ -49,7 +42,7 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # So instead we still use our stock (possibly old) CPAN, and add some
   # handholding
   if ! CPAN_is_sane ; then
-    for m in ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build ; do
+    for m in B/BI/BINGOS/ExtUtils-MakeMaker-6.72.tar.gz ExtUtils::CBuilder Module::Build ; do
       run_or_err "Pre-installing $m" "cpan $m"
     done
   fi
@@ -78,7 +71,7 @@ else
   # (e.g. once Carp is upgraded there's no more Carp::Heavy,
   # while a File::Path upgrade may cause a parallel EUMM run to fail)
   #
-  parallel_installdeps_notest ExtUtils::MakeMaker
+  parallel_installdeps_notest B/BI/BINGOS/ExtUtils-MakeMaker-6.72.tar.gz
   parallel_installdeps_notest File::Path
   parallel_installdeps_notest Carp
   parallel_installdeps_notest Module::Build ExtUtils::Depends