X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=f457959f680f6aed2935400ff254a0147bcc7d60;hb=02ddfe6e0a249c0805e9116f302edae02510c2b9;hp=fcf7accbeaba98e445ab875050bac59d86efd039;hpb=5cbe5b1216f07b5e329f493bd8bdfa5b0aa0f5eb;p=dbsrgits%2FDBIx-Class.git

diff --git a/.travis.yml b/.travis.yml
index fcf7acc..f457959 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,19 +30,15 @@
 #
 
 #
-# Smoke only specific branches to a) not overload the queue and b) not
-# overspam the notification channels
+# Smoke all branches except for blocked* and wip/*
 #
-# 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/*)
+# Additionally master does not smoke with bleadperl
+# ( implemented in maint/travis-ci_scripts/10_before_install.bash )
 #
 branches:
-  only:
-    - master
-    - /^smoke\//
-    - /^topic\//
+  except:
+    - /^wip\//
+    - /^blocked/
 
 notifications:
   irc:
@@ -86,6 +82,7 @@ matrix:
         - CLEANTEST=false
         - BREWOPTS="-Duseithreads"
         - BREWVER=5.8.5
+        - DBIC_TRACE_PROFILE=console
 
     # minimum supported without threads
     - perl: 5.8.3_nt
@@ -93,6 +90,7 @@ matrix:
         - CLEANTEST=false
         - BREWOPTS=""
         - BREWVER=5.8.3
+        - DBIC_TRACE_PROFILE=console_monochrome
 
     # check CLEANTEST of minimum supported
     - perl: 5.8.3_nt_mb
@@ -115,6 +113,24 @@ matrix:
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=5.8.8
 
+    # some permutations of tracing envvar testing
+    - perl: 5.16
+      env:
+        - CLEANTEST=false
+        - DBIC_TRACE=1
+
+    - perl: 5.16
+      env:
+        - CLEANTEST=true
+        - DBIC_TRACE=1
+        - DBIC_TRACE_PROFILE=console
+
+    - perl: 5.16
+      env:
+        - CLEANTEST=false
+        - DBIC_TRACE=1
+        - DBIC_TRACE_PROFILE=console_monochrome
+
 # sourcing the files is *EXTREMELY* important - otherwise
 # no envvars will survive