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

[Emil Velikov]

On 24 April 2017 at 18:15, Eric Engestrom <eric.engestrom at imgtec.com> wrote:
> On Friday, 2017-04-21 13:08:23 +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.
>>
>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
>> ---
>>  .travis.yml | 18 +++++++++++++-----
>>  1 file changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git a/.travis.yml b/.travis.yml
>> index a4fe00d8023..d95d4a74650 100644
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -38,10 +38,18 @@ 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
>> +        - SCONS_TARGET="llvm=1"
>> +        - SCONS_CHECK_COMMAND="scons llvm=1 check"
>>
>>  install:
>>    - pip install --user mako
>> @@ -117,5 +125,5 @@ script:
>>      fi
>>
>>    - if test "x$BUILD" = xscons; then
>> -      scons llvm=1 && scons llvm=1 check;
>> +      scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
>
> Eval? Why not `scons $SCONS_CHECK` with `SCONS_CHECK="llvm=1 check"`?
> (Sorry if this was discussed on v1, I didn't see it.)
>
It wasn't discussed - simply kept the scons check invocation analogous
to the make one*.
Can add a note/comment, if you prefer.

-Emil

*For the latter we use MAKE_CHECK_COMMAND="make -C src/gtest check &&
make -C src/intel check" since a plain "make check" will compile a lot
of tests that we've already tested in another combo.