[Mesa-dev] [PATCH 08/15] travis: split out matrix from env

[Andres Gomez]

On Thu, 2017-04-27 at 19:38 +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> With next commits we'll add a couple of more options.
> 
> v2: Rework check target.
> v3: Comment the current check target, add -j4 SCONSFLAGS
> 
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  .travis.yml | 20 +++++++++++++++-----
>  1 file changed, 15 insertions(+), 5 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index a4fe00d8023..31e1aeb7379 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -38,10 +38,20 @@ env:
>      - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
>      - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
>      - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH"
> -    - MAKEFLAGS=-j2
> -  matrix:
> -    - BUILD=make
> -    - BUILD=scons
> +
> +matrix:
> +  include:
> +    - env:
> +        - LABEL="make"
> +        - BUILD=make
> +        - MAKEFLAGS=-j2
> +    - env:
> +        - LABEL="scons LLVM"
> +        - BUILD=scons
> +        - SCONSFLAGS="-j4"
> +        - SCONS_TARGET="llvm=1"
> +        # Keep it symmetrical to the make build.
> +        - SCONS_CHECK_COMMAND="scons llvm=1 check"

This is kind of confusing since MAKE_CHECK_COMMAND is not introduced
until patch 12 in this series.

I would rather have a specific patch just for that change and use until
then:
scons $SCONS_TARGET && scons $SCONS_TARGET check

Anyway, nitpick. With that changed or not:

This is:

Reviewed-by: Andres Gomez <agomez at igalia.com>

-- 
Br,

Andres