Only smoke blead-pan on allowed-to-fail runs

diff --git a/.travis.yml b/.travis.yml
index 1438706..94f510b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,17 +129,35 @@ matrix:
     ###
     # Start of the allow_failures block
 
-    # bleadperl
+    # recentish stable with blead CPAN
+    - perl: devcpan_5.18.1_thr_mb
+      env:
+        - CLEANTEST=false
+        - BREWOPTS="-Duseithreads -Dusemorebits"
+        - BREWVER=5.18.1
+        - DEVREL_DEPS=true
+
+    # bleadperl with stock CPAN
     - perl: bleadperl_thr_mb
       env:
         - CLEANTEST=false
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=blead
 
+    # bleadperl with blead CPAN
+    - perl: devcpan_bleadperl_thr_mb
+      env:
+        - CLEANTEST=false
+        - BREWOPTS="-Duseithreads -Dusemorebits"
+        - BREWVER=blead
+        - DEVREL_DEPS=true
+
 
   # which ones of the above can fail
   allow_failures:
+    - perl: devcpan_5.18.1_thr_mb
     - perl: bleadperl_thr_mb
+    - perl: devcpan_bleadperl_thr_mb
 
 
 # sourcing the files is *EXTREMELY* important - otherwise

diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash
index a9cac43..ec5c6d5 100755 (executable)
--- a/maint/travis-ci_scripts/20_install.bash
+++ b/maint/travis-ci_scripts/20_install.bash
@@ -14,6 +14,20 @@ fi
 
 export PERL_MM_USE_DEFAULT=1 PERL_MM_NONINTERACTIVE=1 PERL_AUTOINSTALL_PREFER_CPAN=1 PERLBREW_CPAN_MIRROR="$CPAN_MIRROR"
 
+# try CPAN's latest offering if requested
+if [[ "$DEVREL_DEPS" == "true" ]] ; then
+
+  if [[ "$CLEANTEST" == "true" ]] ; then
+    echo_err "DEVREL_DEPS combined with CLEANTEST makes no sense - it is only possible with cpanm"
+    exit 1
+  fi
+
+  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
+
 # Fixup CPANM_OPT to behave more like a traditional cpan client
 export PERL_CPANM_OPT="--verbose --no-interactive $( echo $PERL_CPANM_OPT | sed 's/--skip-satisfied//' )"
 

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index 99b5dc2..42565c3 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -14,17 +14,8 @@ if [[ "$POISON_ENV" = "true" ]] ; then
   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