[Mesa-dev] [PATCH 08/15] travis: split out matrix from env

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

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

v2: Rework check target.
v3: Comment the current check target, add -j4 SCONSFLAGS

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 .travis.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a4fe00d8023..31e1aeb7379 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,10 +38,20 @@ 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"
+        # Keep it symmetrical to the make build.
+        - SCONS_CHECK_COMMAND="scons llvm=1 check"
 
 install:
   - pip install --user mako
@@ -117,5 +127,5 @@ script:
     fi
 
   - if test "x$BUILD" = xscons; then
-      scons llvm=1 && scons llvm=1 check;
+      scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
     fi
-- 
2.12.2