From e5ae4fe929581ea33984d46f2b55c7f1e61ee555 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 6 Sep 2017 16:08:26 +0200 Subject: [PATCH] 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 Reviewed-by: Daniel P. Berrange --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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