[Mesa-dev] [PATCH 11/15] travis: add "make swr" to the build matrix

[Emil Velikov]

On 28 April 2017 at 13:29, Andres Gomez <agomez at igalia.com> wrote:
> On Thu, 2017-04-27 at 19:38 +0100, Emil Velikov wrote:
>> From: Emil Velikov <emil.velikov at collabora.com>
>>
>> v2: Quote OVERRIDE variables.
>>
>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
>> ---
>>  .travis.yml | 39 ++++++++++++++++++++++++++++++++++++---
>>  1 file changed, 36 insertions(+), 3 deletions(-)
>>
>> diff --git a/.travis.yml b/.travis.yml
>> index ae1b5b1bc1a..a4be936656e 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
>
> If libedit-dev is really needed, it is missing in this patch.
>
The Ubuntu LLVM packaging fixes the libedit-dev at some point, but I
chose to keep it listed across the board to keep things consistent and
reduce confusion.
We could do a cleanup at a later stage, as we [mostly] move to a new
enough LLVM.

> It is added later, in the following patch 11 from the series, I would
> bring it here.
>
Seems like I've squashed the hunk with the wrong patch. Thanks for spotting it.

-Emil