X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=5db8be1f84caeffe6e31f2dff3bda13e4af3535a;hb=5d2588ccdd92a01535fefd77c45240f75e8ec090;hp=e6765dc86c915b83c247ac60ef908728ea1b9898;hpb=b58ecb01825f4afa0a13f76b799cd4608bb96ee2;p=dbsrgits%2FDBIx-Class.git

diff --git a/.travis.yml b/.travis.yml
index e6765dc..5db8be1 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,60 +113,69 @@ matrix:
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=5.8.8
 
+    # some permutations of tracing and envvar poisoning
+    - perl: 5.16
+      env:
+        - CLEANTEST=false
+        - POISON_ENV=true
+
+    - perl: 5.16
+      env:
+        - CLEANTEST=true
+        - POISON_ENV=true
+        - DBIC_TRACE=1
+        - DBIC_TRACE_PROFILE=console
+
+    - perl: 5.16
+      env:
+        - CLEANTEST=false
+        - POISON_ENV=true
+        - DBIC_TRACE=1
+        - DBIC_TRACE_PROFILE=console_monochrome
+
 # sourcing the files is *EXTREMELY* important - otherwise
 # no envvars will survive
 
-# timeouts below taken from the base and overrides:
-# https://github.com/travis-ci/travis-worker/blob/master/lib/travis/worker/config.rb#L32
-# https://github.com/travis-ci/travis-worker/blob/master/config/worker.php.yml
+# the entire run times out after 50 minutes, or after 5 minutes without
+# console output
 
 before_install:
   # Sets global envvars, downloads/configures debs based on CLEANTEST
   # Sets extra DBICTEST_* envvars
   #
-  # TIMEOUT: 900s
-  #
   - source maint/travis-ci_scripts/10_before_install.bash
 
 install:
   # Build and switch to a custom perl if requested
   # Configure the perl env, preinstall some generic toolchain parts
   #
-  # TIMEOUT: 900s
-  #
   - source maint/travis-ci_scripts/20_install.bash
 
 before_script:
   # Preinstall/install deps based on envvars/CLEANTEST
   #
-  # TIMEOUT: 900s
-  #
   - source maint/travis-ci_scripts/30_before_script.bash
 
 script:
   # Run actual tests
   #
-  # TIMEOUT: 2100s
-  #
   - source maint/travis-ci_scripts/40_script.bash
 
 after_success:
   # Check if we can assemble a dist properly if not in CLEANTEST
   #
-  # TIMEOUT: 300s
-  #
   - source maint/travis-ci_scripts/50_after_success.bash
 
 after_failure:
   # No tasks yet
   #
-  # TIMEOUT: 300s
-  #
   #- source maint/travis-ci_scripts/50_after_failure.bash
 
 after_script:
   # No tasks yet
   #
-  # TIMEOUT: 300s
-  #
   #- source maint/travis-ci_scripts/60_after_script.bash
+
+  # if we do not unset this before we terminate the travis teardown will
+  # mark the entire job as failed
+  - set +e