From: Peter Rabbitson <ribasushi@cpan.org>
Date: Mon, 3 Dec 2012 11:46:24 +0000 (+0100)
Subject: Smoke bleadperl as well
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d0b79c51514519ddd61e90123c9f7e5e792515b3;p=dbsrgits%2FDBIx-Class-Historic.git

Smoke bleadperl as well
---

diff --git a/.travis.yml b/.travis.yml
index d074ff5..ad51211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,10 +29,15 @@
 # WONTFIX "explanation") here: https://github.com/travis-ci/travis-ci/issues/497
 #
 
+#
 # Smoke only specific branches to a) not overload the queue and b) not
 # overspam the notification channels
+#
 # Furthermore if the branch is ^topic/ - the custom compiled smokes will
 # not run at all, again in order to conserve queue resources
+#
+# Additionally bleadperl tests do not run on master (but do run on smoke/*)
+#
 branches:
   only:
     - master
@@ -82,6 +87,13 @@ matrix:
         - BREWOPTS=""
         - BREWVER=5.8.3
 
+    # bleadperl
+    - perl: bleadperl_thr_mb
+      env:
+        - CLEANTEST=false
+        - BREWOPTS="-Duseithreads -Dusemorebits"
+        - BREWVER=blead
+
     # check CLEANTEST of minimum supported
     - perl: 5.8.3_nt_mb
       env:
diff --git a/maint/travis-ci_prepare_env b/maint/travis-ci_prepare_env
index e765094..e3a9e42 100755
--- a/maint/travis-ci_prepare_env
+++ b/maint/travis-ci_prepare_env
@@ -66,16 +66,25 @@ export PERL_MM_USE_DEFAULT=1 PERL_MM_NONINTERACTIVE=1 PERL_AUTOINSTALL_PREFER_CP
 export PERL_CPANM_OPT="$( echo $PERL_CPANM_OPT | sed 's/--skip-satisfied//' )"
 
 if [[ -n "$BREWVER" ]] ; then
-  # if this is not master and not a smoke/ branch - cancel all testing
-  if [[ "$TRAVIS_BRANCH" =~ "topic/" ]]; then
+  # .travis.yml already restricts branches to master, topic/* and smoke/*
+  # do some extra short-circuiting here
+
+  # when smoking master do not attempt bleadperl (not release-critical)
+  if [[ "$TRAVIS_BRANCH" = "master" ]] && [[ "$BREWVER" = "blead" ]]; then
+    export SHORT_CIRCUIT_SMOKE=1
+  # on topic/ branches test only with travis perls
+  elif [[ "$TRAVIS_BRANCH" =~ "topic/" ]]; then
     export SHORT_CIRCUIT_SMOKE=1
+  fi
+
+  if [[ -n "$SHORT_CIRCUIT_SMOKE" ]]; then
     echo_err "$(tstamp) non-smoke branch and custom perl compilation requested - bailing out"
     sleep 20  # give the console time to attach, otherwise it hangs
     return  # this is like an `exit 0` in sourcing
   fi
 
   run_or_err "Compiling/installing Perl $BREWVER (without testing, may take up to 5 minutes)" \
-    "perlbrew install --as $BREWVER --notest $BREWOPTS -j $NUMTHREADS perl-$BREWVER"
+    "perlbrew install --as $BREWVER --notest $BREWOPTS -j $NUMTHREADS $BREWVER"
 
   perlbrew use $BREWVER
 fi