diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-04-06 18:01:19 +0100 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2017-05-02 12:09:03 +0300 |
| commit | 9e8629d52005fb6ea8da68b6374961fb500235a0 (patch) | |
| tree | 1b093a1aa5419b345275c0a496ee5cb46024933e | |
| parent | 8ceaec5f487b92be3728d460d108b29e8a32878e (diff) | |
travis: add "make swr" to the build matrix
v2: Quote OVERRIDE variables.
v3: Add missplaced libedit-dev hunk (Andres).
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
(cherry picked from commit 8479fd8a1099c4bf37fb8cded7a3040b4d366fbc)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <agomez@igalia.com>
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 755656f6d1e..c016f95d0b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,9 @@ matrix: - MAKEFLAGS=-j2 - LLVM_VERSION=3.9 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" + - DRI_DRIVERS="i915,i965,radeon,r200,swrast,nouveau" + - GALLIUM_DRIVERS="i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx" + - VULKAN_DRIVERS="radeon" addons: apt: sources: @@ -48,6 +51,36 @@ matrix: - libx11-xcb-dev - libelf-dev - env: + # NOTE: Building SWR is 2x (yes two) times slower than all the other + # gallium drivers combined. + # Start this early so that it doesn't hunder the run time. + - LABEL="make Gallium Drivers SWR" + - BUILD=make + - MAKEFLAGS=-j2 + - LLVM_VERSION=3.9 + - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" + - OVERRIDE_CC="gcc-5" + - OVERRIDE_CXX="g++-5" + - DRI_DRIVERS="" + - GALLIUM_DRIVERS="swr" + - VULKAN_DRIVERS="" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-3.9 + packages: + # 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 + - env: - LABEL="scons" - BUILD=scons - SCONSFLAGS="-j4" @@ -179,11 +212,13 @@ install: script: - if test "x$BUILD" = xmake; then + test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC"; + test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX"; ./autogen.sh --enable-debug --with-egl-platforms=x11,drm - --with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau - --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx - --with-vulkan-drivers=radeon + --with-dri-drivers=$DRI_DRIVERS + --with-gallium-drivers=$GALLIUM_DRIVERS + --with-vulkan-drivers=$VULKAN_DRIVERS --disable-llvm-shared-libs ; make && make check; |