X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=c83f52a28909dec3849d8fe758ffc139fbd12029;hb=f991529a891719f91902c8fe476e0406a10555c1;hp=f1f941cce0acd2184f907384274cd26641b2a84d;hpb=d1975f084e017f01d6372d0decb315254bd38b40;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/.travis.yml b/.travis.yml
index f1f941c..c83f52a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,14 +69,13 @@ language: perl
 
 perl:
   - "5.18"
-  - "5.16"
 
 env:
   - CLEANTEST=false
   - CLEANTEST=false DBICTEST_MYSQL_INNODB=1
   - CLEANTEST=true
 
-x_disabled_matrix:
+matrix:
   fast_finish: true
   include:
     # this particular perl is quite widespread
@@ -114,6 +113,7 @@ x_disabled_matrix:
         - BREWOPTS="-Duseithreads"
         - BREWVER=5.8.5
         - DBIC_TRACE_PROFILE=console
+        - DBICTEST_MYSQL_INNODB=1
 
     # Full Test of minimum supported without threads
     - perl: 5.8.3_nt
@@ -122,6 +122,7 @@ x_disabled_matrix:
         - BREWOPTS=""
         - BREWVER=5.8.3
         - DBIC_TRACE_PROFILE=console_monochrome
+        - DBICTEST_MYSQL_INNODB=1
 
     ###
     # some permutations of tracing and envvar poisoning
@@ -132,6 +133,7 @@ x_disabled_matrix:
         - POISON_ENV=true
         - DBIC_TRACE=1
         - DBIC_MULTICREATE_DEBUG=0
+        - DBICTEST_MYSQL_INNODB=1
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=5.16.2
 
@@ -147,6 +149,7 @@ x_disabled_matrix:
         - POISON_ENV=true
         - DBIC_TRACE=1
         - DBIC_TRACE_PROFILE=console
+        - DBICTEST_MYSQL_INNODB=1
 
     - perl: 5.18
       env:
@@ -155,6 +158,7 @@ x_disabled_matrix:
         - DBIC_TRACE=1
         - DBIC_TRACE_PROFILE=console_monochrome
         - DBIC_MULTICREATE_DEBUG=0
+        - DBICTEST_MYSQL_INNODB=1
 
     ###
     # Start of the allow_failures block
@@ -190,6 +194,7 @@ x_disabled_matrix:
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=5.18.2
         - DEVREL_DEPS=true
+        - DBICTEST_MYSQL_INNODB=1
 
     # bleadperl with stock CPAN, full depchain test
     - perl: bleadperl
@@ -204,6 +209,7 @@ x_disabled_matrix:
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=blead
         - DEVREL_DEPS=true
+        - DBICTEST_MYSQL_INNODB=1
 
 
   # which ones of the above can fail
@@ -217,6 +223,10 @@ x_disabled_matrix:
     - perl: bleadperl
     - perl: devcpan_bleadperl_thr_mb
 
+    # Several upstream deps are flaky on 5.8.3
+    - perl: 5.8.3_nt
+    - perl: 5.8.3_nt_mb
+
 
 # sourcing the files is *EXTREMELY* important - otherwise
 # no envvars will survive