Mesa (master): travis: add "scons swr" to the build matrix
Emil Velikov
evelikov at kemper.freedesktop.org
Sat Apr 29 13:40:25 UTC 2017
Module: Mesa
Branch: master
Commit: f55d98ac85145fc35e7ee1e41520c07b6f083bb8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f55d98ac85145fc35e7ee1e41520c07b6f083bb8
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Thu Apr 6 16:23:21 2017 +0100
travis: add "scons swr" to the build matrix
Requires GCC 5.0 (due to the C++14 requirement) and LLVM 3.9.
v2: Enable the target, add libedit-dev, rework check target.
v3: Comment the current check target, add -j4 SCONSFLAGS, quote OVERRIDE
variables.
v4: Keep check target as-is (Andres)
Cc: Tim Rowley <timothy.o.rowley at intel.com>
Cc: George Kyriazis <george.kyriazis at intel.com>
Reviewed-by: George Kyriazis <george.kyriazis at intel.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Andres Gomez <agomez at igalia.com>
---
.travis.yml | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 38f5571351..be394f3127 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,6 +79,32 @@ matrix:
- libexpat1-dev
- libx11-xcb-dev
- libelf-dev
+ - env:
+ - LABEL="scons SWR"
+ - BUILD=scons
+ - SCONSFLAGS="-j4"
+ - SCONS_TARGET="swr=1"
+ - LLVM_VERSION=3.9
+ - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+ - OVERRIDE_CC="gcc-5"
+ - OVERRIDE_CXX="g++-5"
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ - llvm-toolchain-trusty-3.9
+ packages:
+ - scons
+ # LLVM packaging is broken and misses these dependencies
+ - libedit-dev
+ # From sources above
+ - g++-5
+ - llvm-3.9-dev
+ # Common
+ - x11proto-xf86vidmode-dev
+ - libexpat1-dev
+ - libx11-xcb-dev
+ - libelf-dev
install:
- pip install --user mako
@@ -154,5 +180,7 @@ script:
fi
- if test "x$BUILD" = xscons; then
+ test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC";
+ test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
scons $SCONS_TARGET && scons $SCONS_TARGET check;
fi
More information about the mesa-commit
mailing list