Mesa (master): travis: split out matrix from env
Emil Velikov
evelikov at kemper.freedesktop.org
Sat Apr 29 13:40:24 UTC 2017
Module: Mesa
Branch: master
Commit: 56ba252e230dfeb93fad26cdbf5f6247524459c7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=56ba252e230dfeb93fad26cdbf5f6247524459c7
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Thu Apr 6 14:38:40 2017 +0100
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 at collabora.com>
Reviewed-by: Andres Gomez <agomez at igalia.com>
---
.travis.yml | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a4fe00d802..0d87c663bb 100644
--- 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
More information about the mesa-commit
mailing list