[Mesa-dev] [PATCH] travis: make drivers explicit in Meson targets

[Eric Engestrom]

On Wednesday, 2018-08-08 16:36:55 +0200, Juan A. Suarez Romero wrote:
> Like in the autotools target, make the list of drivers to be built in
> each of the Meson targets explicit.
> 
> This will help to identify missing dependencies and other issues more
> easily.
> 
> CC: Emil Velikov <emil.velikov at collabora.com>

Technically, we could simply always put the [] around the list, but then
it would become a shell glob so we would have to quote it, but it's
already inside quotes, so escape...
Yeah, let's just leave it like you did :)

Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

> ---
>  .travis.yml | 17 ++++++++++++++---
>  1 file changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 9f91d2c9b69..430c159c9c5 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -35,7 +35,9 @@ matrix:
>      - env:
>          - LABEL="meson Vulkan"
>          - BUILD=meson
> -        - MESON_OPTIONS="-Ddri-drivers=[] -Dgallium-drivers=[]"
> +        - DRI_DRIVERS=""
> +        - GALLIUM_DRIVERS=""
> +        - VULKAN_DRIVERS="intel,amd"
>          - LLVM_VERSION=6.0
>          - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
>        addons:
> @@ -55,7 +57,9 @@ matrix:
>      - env:
>          - LABEL="meson loaders/classic DRI"
>          - BUILD=meson
> -        - MESON_OPTIONS="-Dvulkan-drivers=[] -Dgallium-drivers=[]"
> +        - DRI_DRIVERS="i915,i965,r100,r200,swrast,nouveau"
> +        - GALLIUM_DRIVERS=""
> +        - VULKAN_DRIVERS=""
>        addons:
>          apt:
>            packages:
> @@ -463,7 +467,6 @@ matrix:
>      - env:
>          - LABEL="macOS meson"
>          - BUILD=meson
> -        - MESON_OPTIONS="-Degl=false"
>        os: osx
>  
>  before_install:
> @@ -647,6 +650,14 @@ script:
>    - |
>      if test "x$BUILD" = xmeson; then
>  
> +      if test "x$TRAVIS_OS_NAME" == xosx; then
> +        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
> +
>        # Travis CI has moved to LLVM 5.0, and meson is detecting
>        # automatically the available version in /usr/local/bin based on
>        # the PATH env variable order preference.
> -- 
> 2.17.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev