diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-04-06 16:23:21 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-04-29 13:35:17 +0100 |
| commit | f55d98ac85145fc35e7ee1e41520c07b6f083bb8 (patch) | |
| tree | 008326aa14daf3a8a2aedb1b7c71b70805493d5a /.travis.yml | |
| parent | 85ee2c6cfcd5deeca2ee0cf11079afccd6e7324e (diff) | |
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@intel.com>
Cc: George Kyriazis <george.kyriazis@intel.com>
Reviewed-by: George Kyriazis <george.kyriazis@intel.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 28 |
1 files changed, 28 insertions, 0 deletions
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 |