[Mesa-dev] [PATCH 08/13] 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.

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

diff --git a/.travis.yml b/.travis.yml
index bf1f710dea3..bd7ccb8917c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,10 +39,17 @@ 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
+        - SCONS_TARGET="llvm=1"
 
 install:
   - pip install --user mako
@@ -126,5 +133,5 @@ script:
     fi
 
   - if test "x$BUILD" = xscons; then
-      scons llvm=1 && scons llvm=1 check;
+      scons $SCONS_TARGET && scons $SCONS_TARGET check;
     fi
-- 
2.11.1