X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=d6f278954ca029e4ec481fd347b56db753d1407d;hb=78b82c85c23b98023e5ad86d70a85bd3102a4927;hp=9fe3eacd114c474e32911551e5941c8c451f9ced;hpb=6bb14e9bcb10e0c64a3d4b8ee4c600b34ec12f12;p=dbsrgits%2FDBIx-Class.git

diff --git a/.travis.yml b/.travis.yml
index 9fe3eac..d6f2789 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,15 +86,17 @@ matrix:
     - perl: 5.8.3_nt_mb
       env:
         - CLEANTEST=true
+        - POISON_ENV=true
         - DBIC_TRACE_PROFILE=console_monochrome
         - BREWVER=5.8.3
         - BREWOPTS="-Dusemorebits"
 
-    # Full Test of minimum supported without threads with non-tracing poisoning
+    # Full Test of minimum supported without threads with plain poisoned trace
     - perl: 5.8.3_nt
       env:
         - CLEANTEST=false
         - POISON_ENV=true
+        - DBIC_TRACE=1
         - BREWVER=5.8.3
 
     # Full Test of minimum supported with threads with non-tracing poisoning
@@ -113,16 +117,17 @@ matrix:
         - BREWVER=5.8.4
 
     # CLEANTEST: this particular perl is quite widespread
-    - perl: 5.8.8_thr_mb
+    - perl: 5.8.8_thr
       env:
         - CLEANTEST=true
         - BREWVER=5.8.8
-        - BREWOPTS="-Duseithreads -Dusemorebits"
+        - BREWOPTS="-Duseithreads"
 
-    # 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 +144,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,40 +155,67 @@ 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
+        - DBICTEST_VERSION_WARNS_INDISCRIMINATELY=1
 
     ###
     # 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 and plain trace
+    - perl: devcpan_5.8.1
       env:
         - CLEANTEST=true
         - DEVREL_DEPS=true
         - POISON_ENV=true
-        - BREWVER=5.8.4
+        - DBIC_TRACE=1
+        - DBICTEST_VERSION_WARNS_INDISCRIMINATELY=1
+        - 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.8.8 threaded MB (exercises P5#72210)
+    - perl: devcpan_5.8.8_thr_mb
+      env:
+        - CLEANTEST=true
+        - DBICTEST_VERSION_WARNS_INDISCRIMINATELY=1
+        - DEVREL_DEPS=true
+        - BREWVER=5.8.8
+        - BREWOPTS="-Duseithreads -Dusemorebits"
+
     # 5.10.0 threaded with blead CPAN
     - perl: devcpan_5.10.0_thr_mb
       env:
@@ -207,26 +239,36 @@ 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.8.8_thr_mb
     - 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
 
 
 ###