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

diff --git a/.travis.yml b/.travis.yml
index db8fdfa..5db8be1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,24 +25,20 @@
 # * The way .travis.yml is fed to the command controller is idiotic - it
 # makes using multiline `bash -c` statements impossible. Therefore to
 # aid readability (our travis logic is rather complex), the bulk of
-# functionality is moved to a script. More about the problem (and the
+# functionality is moved to scripts. More about the problem (and the
 # 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
+# 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:
@@ -73,12 +69,20 @@ env:
 
 matrix:
   include:
+    # bleadperl
+    - perl: bleadperl_thr_mb
+      env:
+        - CLEANTEST=false
+        - BREWOPTS="-Duseithreads -Dusemorebits"
+        - BREWVER=blead
+
     # minimum supported with threads
     - perl: 5.8.5_thr
       env:
         - CLEANTEST=false
         - BREWOPTS="-Duseithreads"
         - BREWVER=5.8.5
+        - DBIC_TRACE_PROFILE=console
 
     # minimum supported without threads
     - perl: 5.8.3_nt
@@ -86,13 +90,7 @@ matrix:
         - CLEANTEST=false
         - BREWOPTS=""
         - BREWVER=5.8.3
-
-    # bleadperl
-    - perl: bleadperl_thr_mb
-      env:
-        - CLEANTEST=false
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=blead
+        - DBIC_TRACE_PROFILE=console_monochrome
 
     # check CLEANTEST of minimum supported
     - perl: 5.8.3_nt_mb
@@ -115,30 +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
+
+# the entire run times out after 50 minutes, or after 5 minutes without
+# console output
+
 before_install:
-  # Do not make this part of the env-matrix
-  # different boxes we run on have different amount of hw threads
-  # hence why we need to query
-  # result is 1.5 times the physical threads
-  - export NUMTHREADS=$(( ( $(cut -f 2 -d '-' /sys/devices/system/cpu/online) + 1 ) * 15 / 10  ))
+  # Sets global envvars, downloads/configures debs based on CLEANTEST
+  # Sets extra DBICTEST_* envvars
+  #
+  - source maint/travis-ci_scripts/10_before_install.bash
 
 install:
   # Build and switch to a custom perl if requested
-  # Set the environment based on CLEANTEST
-  # Preinstall/install deps
+  # Configure the perl env, preinstall some generic toolchain parts
   #
-  # sourcing the file is *EXTREMELY* important - otherwise
-  # no envvars will survive
-  - source maint/travis-ci_prepare_env
+  - source maint/travis-ci_scripts/20_install.bash
 
-script:
-  - export HARNESS_TIMER=1 HARNESS_OPTIONS=c:j$NUMTHREADS
+before_script:
+  # Preinstall/install deps based on envvars/CLEANTEST
+  #
+  - source maint/travis-ci_scripts/30_before_script.bash
 
-  # either a plain 'make test' OR a shuffled prove torture
-  # use the random order test plan unless CLEANTEST
-  # prepare_env may have short-circuited the test entirely
-  - test -n "$SHORT_CIRCUIT_SMOKE" || (test "$CLEANTEST" = "true" && make test || prove -lrswj$NUMTHREADS t xt)
+script:
+  # Run actual tests
+  #
+  - source maint/travis-ci_scripts/40_script.bash
 
 after_success:
-  # check if we can assemble a dist properly given we have all deps
-  - test -n "$SHORT_CIRCUIT_SMOKE" || test "$CLEANTEST" = "true" || make dist
+  # Check if we can assemble a dist properly if not in CLEANTEST
+  #
+  - source maint/travis-ci_scripts/50_after_success.bash
+
+after_failure:
+  # No tasks yet
+  #
+  #- source maint/travis-ci_scripts/50_after_failure.bash
+
+after_script:
+  # No tasks yet
+  #
+  #- 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