From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 6 Sep 2017 14:08:26 +0000 (+0200)
Subject: travis: Improve test matrix
X-Git-Tag: v3.8.0-rc1~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5ae4fe929581ea33984d46f2b55c7f1e61ee555;p=thirdparty%2Flibvirt.git

travis: Improve test matrix

The default distribution is apparently ignored if an explicit test
matrix is provided, so we haven't actually been testing the precise
plus gcc combo.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/.travis.yml b/.travis.yml
index 1ade6dfa34..4aecb6bf40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,5 @@
 sudo: false
 language: c
-dist: precise
-compiler:
-  - gcc
 cache: ccache
 addons:
   apt:
@@ -80,15 +77,16 @@ script:
   # syntax-check as well, so skip those steps on that platform for now
   - make -j3 && if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j3 syntax-check && make -j3 check; fi
 
-# Environments here are run in addition to the main environment defined above
 matrix:
   include:
+    - compiler: gcc
+      dist: precise
+    - compiler: gcc
+      dist: trusty
     - compiler: clang
       dist: precise
     - compiler: clang
       dist: trusty
-    - compiler: gcc
-      dist: trusty
     - compiler: clang
       os: osx