X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=ad5121183f3d3146276f86e16a1def815392e9a8;hb=331886ef1b5ab7a732915b8213dd525a3ea63b88;hp=3abc1d7b00521a84ac34b78c41d7e03c65c8ef4c;hpb=d70070c9e7e2a2ec3306f6b95f770c0faff61cbb;p=dbsrgits%2FDBIx-Class.git

diff --git a/.travis.yml b/.travis.yml
index 3abc1d7..ad51211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,18 @@
 # attention of ribasushi. *DO NOT* disable 5.8 testing - it is here for a
 # reason
 #
-# * The matrix is built from two main modes - CLEANTEST = [true|false]. In
-# the first case we test with minimal deps available, and skip everything
-# listed in DBIC::OptDesps. Without CLEANTEST we bring the armada of RDBMS
-# and install the maximum possible set of deps and configs
+# * The matrix is built from two main modes - CLEANTEST = [true|false].
+# - In the first case we test with minimal deps available, and skip everything
+#   listed in DBIC::OptDesps. The modules are installed with classic CPAN
+#   invocations and are *fully tested*. In other words we simulate what would
+#   happen if a user tried to install on a just-compiled virgin perl
+# - Without CLEANTEST we bring the armada of RDBMS and install the maximum
+#   possible set of deps *without testing them*. This ensures we stay within
+#   a reasonable build-time and still run as many of our tests as possible
 #
-# * All builds/tests run under NUMTHREADS number of threads.
+# * The perl builds and the DBIC tests run under NUMTHREADS number of threads.
+# The testing of dependencies under CLEANTEST runs single-threaded, at least
+# until we fix our entire dep-chain to safely pass under -j
 #
 # * The way .travis.yml is fed to the command controller is idiotic - it
 # makes using multiline `bash -c` statements impossible. Therefore to
@@ -23,13 +29,20 @@
 # 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
+#
+# 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
-    - /^topic\//
     - /^smoke\//
+    - /^topic\//
 
 notifications:
   irc:
@@ -42,9 +55,12 @@ notifications:
     use_notice: true
 
   email:
-    - ribasushi@cpan.org
-    # Temporary - if it proves to be too noisy, we'll shut it off
-    - dbix-class-devel@lists.scsys.co.uk
+    recipients:
+      - ribasushi@cpan.org
+      # Temporary - if it proves to be too noisy, we'll shut it off
+      #- dbix-class-devel@lists.scsys.co.uk
+    on_success: change
+    on_failure: change
 
 language: perl
 
@@ -71,6 +87,20 @@ 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:
+        - CLEANTEST=true
+        - BREWOPTS="-Dusemorebits"
+        - BREWVER=5.8.3
+
     # this is the perl suse ships
     - perl: 5.10.0_thr_dbg
       env:
@@ -85,7 +115,6 @@ matrix:
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=5.8.8
 
-
 before_install:
   # Do not make this part of the env-matrix
   # different boxes we run on have different amount of hw threads
@@ -103,7 +132,9 @@ install:
   - source maint/travis-ci_prepare_env
 
 script:
-  # either a plain 'make test' OR a shuffled prove torture
   - export HARNESS_TIMER=1 HARNESS_OPTIONS=c:j$NUMTHREADS
+
+  # either a plain 'make test' OR a shuffled prove torture
   # use the random order test plan unless CLEANTEST
-  - test "$CLEANTEST" = "true" && make test || prove -lrswj$NUMTHREADS t xt
+  # prepare_env may have short-circuited the test entirely
+  - test -n "$SHORT_CIRCUIT_SMOKE" || (test "$CLEANTEST" = "true" && make test || prove -lrswj$NUMTHREADS t xt)