travis: split out matrix from env

With next commits we'll add a couple of more options.

v2: Rework check target.
v3: Comment the current check target, add -j4 SCONSFLAGS
v4: Keep check target as-is, will rework with later patch.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>

diff --git a/.travis.yml b/.travis.yml
index a4fe00d8023dc407ecf86d65f74980ea1e6bcbed..0d87c663bb2e2d169a6b0fc2ecb499ef726a88d1 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,10 +38,18 @@ env:
     - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
     - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
     - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH"
-    - MAKEFLAGS=-j2
-  matrix:
-    - BUILD=make
-    - BUILD=scons
+
+matrix:
+  include:
+    - env:
+        - LABEL="make"
+        - BUILD=make
+        - MAKEFLAGS=-j2
+    - env:
+        - LABEL="scons LLVM"
+        - BUILD=scons
+        - SCONSFLAGS="-j4"
+        - SCONS_TARGET="llvm=1"
 
 install:
   - pip install --user mako
@@ -117,5 +125,5 @@ script:
     fi
 
   - if test "x$BUILD" = xscons; then
-      scons llvm=1 && scons llvm=1 check;
+      scons $SCONS_TARGET && scons $SCONS_TARGET check;
     fi