X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=b0708941b467644e80b82317ffa9d60d8b0668dd;hb=topic%2Fmooification;hp=f036df198ad24d3ce39a3185b85b5b0838fbbf16;hpb=16c65a3765ce28f6745389d6513e5f097e95391d;p=dbsrgits%2FDBIx-Class.git

diff --git a/.travis.yml b/.travis.yml
index f036df1..b070894 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@
 #   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
 #
-# * The perl builds and the DBIC tests run under NUMTHREADS number of threads.
+# * The perl builds and the DBIC tests run under VCPU_USE 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
 #
@@ -75,7 +75,9 @@ perl:
 
 env:
   - CLEANTEST=false
-  - CLEANTEST=true NUMTHREADS=1
+  - CLEANTEST=true VCPU_USE=1
+
+sudo: true
 
 matrix:
   fast_finish: true
@@ -84,6 +86,7 @@ matrix:
     - perl: 5.8.3_nt_mb
       env:
         - CLEANTEST=true
+        - POISON_ENV=true
         - DBIC_TRACE_PROFILE=console_monochrome
         - BREWVER=5.8.3
         - BREWOPTS="-Dusemorebits"
@@ -119,10 +122,11 @@ matrix:
         - BREWVER=5.8.8
         - BREWOPTS="-Duseithreads -Dusemorebits"
 
-    # CLEANTEST: this is the perl suse ships
+    # CLEANTEST: this is the perl suse ships, with env poisoning
     - perl: 5.10.0_thr_dbg
       env:
         - CLEANTEST=true
+        - POISON_ENV=true
         - BREWVER=5.10.0
         - BREWOPTS="-DDEBUGGING -Duseithreads"
 
@@ -139,10 +143,10 @@ matrix:
     - perl: 5.12.3_thr
       env:
         - CLEANTEST=true
+        - POISON_ENV=true
         - DBIC_TRACE=1
         - DBIC_MULTICREATE_DEBUG=1
         - DBIC_STORAGE_RETRY_DEBUG=1
-        - POISON_ENV=true
         - DBIC_TRACE_PROFILE=console
         - BREWVER=5.12.3
         - BREWOPTS="-Duseithreads"
@@ -150,38 +154,53 @@ matrix:
     - perl: 5.16.3_thr_mb
       env:
         - CLEANTEST=false
-        - DBIC_TRACE=1
         - POISON_ENV=true
+        - DBIC_TRACE=1
         - BREWVER=5.16.3
         - BREWOPTS="-Duseithreads -Dusemorebits"
 
     - perl: 5.18-extras
       env:
         - CLEANTEST=false
-        - DBIC_TRACE=1
         - POISON_ENV=true
+        - DBIC_TRACE=1
         - DBIC_TRACE_PROFILE=console_monochrome
         - DBICTEST_VIA_REPLICATED=0
 
     ###
     # Start of the allow_failures block
 
-    # threaded oldest possible with blead CPAN with non-tracing poisoning
+    # threaded oldest possible with blead CPAN
     - perl: devcpan_5.8.1_thr_mb
       env:
         - CLEANTEST=true
         - DEVREL_DEPS=true
-        - POISON_ENV=true
         - BREWVER=5.8.1
         - BREWOPTS="-Duseithreads -Dusemorebits"
 
-    # 5.8.4 threaded with blead CPAN with non-tracing poisoning
-    - perl: devcpan_5.8.4_thr
+    # oldest possible with blead CPAN with poisoning
+    - perl: devcpan_5.8.1
       env:
         - CLEANTEST=true
         - DEVREL_DEPS=true
         - POISON_ENV=true
-        - BREWVER=5.8.4
+        - BREWVER=5.8.1
+
+    # 5.8.3 with blead CPAN
+    - perl: devcpan_5.8.3_mb
+      env:
+        - CLEANTEST=false
+        - DEVREL_DEPS=true
+        - BREWVER=5.8.3
+        - BREWOPTS="-Dusemorebits"
+
+    # 5.8.7 threaded with blead CPAN with non-tracing poisoning
+    - perl: devcpan_5.8.7_thr
+      env:
+        - CLEANTEST=true
+        - DEVREL_DEPS=true
+        - POISON_ENV=true
+        - BREWVER=5.8.7
         - BREWOPTS="-Duseithreads"
 
     # 5.10.0 threaded with blead CPAN
@@ -207,26 +226,35 @@ matrix:
         - POISON_ENV=true
         - BREWVER=blead
 
-    # bleadperl with blead CPAN with non-tracing poisoning
+    # bleadperl with blead CPAN
     - perl: devcpan_bleadperl_thr_mb
       env:
         - CLEANTEST=false
         - DEVREL_DEPS=true
-        - POISON_ENV=true
         - BREWVER=blead
         - BREWOPTS="-Duseithreads -Dusemorebits"
 
+    # CLEANTEST of http://schplog.schmorp.de/2015-06-06-a-stable-perl.html with non-tracing poisoning
+    - perl: schmorp_stableperl_thr_mb
+      env:
+        - CLEANTEST=true
+        - POISON_ENV=true
+        - BREWVER=schmorp_stableperl
+        - BREWOPTS="-Duseithreads -Dusemorebits"
 
   # which ones of the above can fail
   allow_failures:
 
     # these run with various dev snapshots - allowed to fail
     - perl: devcpan_5.8.1_thr_mb
-    - perl: devcpan_5.8.4_thr
+    - perl: devcpan_5.8.1
+    - perl: devcpan_5.8.3_mb
+    - perl: devcpan_5.8.7_thr
     - perl: devcpan_5.10.0_thr_mb
     - perl: devcpan_5.12.1_thr
     - perl: bleadperl
     - perl: devcpan_bleadperl_thr_mb
+    - perl: schmorp_stableperl_thr_mb
 
 
 ###
@@ -275,6 +303,11 @@ script:
   #
   - maint/getstatus maint/travis-ci_scripts/40_script.bash
 
+###
+### Set -e back, work around https://github.com/travis-ci/travis-ci/issues/3533
+###
+  - set -e
+
 after_success:
   # Check if we can assemble a dist properly if not in CLEANTEST
   #