Quoting Emil Velikov (2018-12-13 08:06:03)
> From: Emil Velikov <emil.veli...@collabora.com>
>
> It makes for a shorter MESON_OPTIONS and cleaner handling.
>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
> .travis.yml | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 8cb7f8b95c1..4966f7eb1bf 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -34,8 +34,6 @@ matrix:
> - env:
> - LABEL="meson Vulkan"
> - BUILD=meson
> - - DRI_DRIVERS=""
> - - GALLIUM_DRIVERS=""
> - VULKAN_DRIVERS="intel,amd"
> - LLVM_VERSION=7
> - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
> @@ -58,8 +56,6 @@ matrix:
> - LABEL="meson loaders/classic DRI"
> - BUILD=meson
> - DRI_DRIVERS="i915,i965,r100,r200,swrast,nouveau"
> - - GALLIUM_DRIVERS=""
> - - VULKAN_DRIVERS=""
> addons:
> apt:
> packages:
> @@ -636,10 +632,6 @@ script:
> MESON_OPTIONS="-Degl=false"
> fi
>
> - if test "x$TRAVIS_OS_NAME" == xlinux; then
> - MESON_OPTIONS="-Ddri-drivers=${DRI_DRIVERS:-[]}
> -Dgallium-drivers=${GALLIUM_DRIVERS:-[]}
> -Dvulkan-drivers=${VULKAN_DRIVERS:-[]}"
> - fi
> -
> # We need to control the version of llvm-config we're using, so we'll
> # generate a native file to do so. This requires meson >=0.49
> #
> @@ -650,7 +642,10 @@ script:
> export CFLAGS="$CFLAGS -isystem`pwd`"
> meson _build $MESON_OPTIONS \
> --native-file=native.file \
> - -Dbuild-tests=true
> + -Dbuild-tests=true \
> + -Ddri-drivers=${DRI_DRIVERS:-[]} \
> + -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} \
> + -Dvulkan-drivers=${VULKAN_DRIVERS:-[]}
> meson configure _build
> ninja -C _build
> ninja -C _build test
> --
> 2.19.2Much cleaner :) Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
