Travis CI: Specify test configurations using 'matrix:include'

(Cherry-pick commit 6a640c7 from 'release-7_4' branch.)

diff --git a/.travis.yml b/.travis.yml
index a7ab0b837584e8053d45a3a5fa1ef09690e8a79b..a48dda99600639c535472516e20eb2235b831f5c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,16 @@
 language: c
 
-os:
-  - linux
-  - osx
-
-compiler:
-  - clang
-  - gcc
-
 matrix:
-  exclude:
-  - os: osx
-    compiler: gcc
-
-sudo: false
+  include:
+    - os: linux
+      compiler: clang
+    - os: linux
+      compiler: gcc
+    - os: osx
 
 install:
   - autoreconf -vif
-  - ./configure
 
 script:
+  - ./configure
   - make -j check