On Friday, 2017-04-21 13:08:26 +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
> .travis.yml | 39 ++++++++++++++++++++++++++++++++++++---
> 1 file changed, 36 insertions(+), 3 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index aa2a55d7bb4..1b0368f0a5e 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -31,6 +31,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:
> @@ -46,6 +49,34 @@ 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:
> + # 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
> # Explicitly disable.
> @@ -172,11 +203,13 @@ install:
>
> script:
> - if test "x$BUILD" = xmake; then
> + test $OVERRIDE_CC && export CC=$OVERRIDE_CC;
> + test $OVERRIDE_CXX && export CXX=$OVERRIDE_CXX;
This will break if/when someone adds flags.
`test -n "$OVERRIDE_CCC"` doesn't have this issue.
> ./autogen.sh --enable-debug
> --with-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;
> --
> 2.12.2
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
