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>
This commit is contained in:
parent
85ee2c6cfc
commit
f55d98ac85
28
.travis.yml
28
.travis.yml
|
@ -79,6 +79,32 @@ matrix:
|
||||||
- libexpat1-dev
|
- libexpat1-dev
|
||||||
- libx11-xcb-dev
|
- libx11-xcb-dev
|
||||||
- libelf-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:
|
install:
|
||||||
- pip install --user mako
|
- pip install --user mako
|
||||||
|
@ -154,5 +180,7 @@ script:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- if test "x$BUILD" = xscons; then
|
- 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;
|
scons $SCONS_TARGET && scons $SCONS_TARGET check;
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue