[Mesa-dev] [PATCH 10/14] travis: add "scons swr" to the build matrix

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Requires GCC 5.0 (due to the C++14 requirement) and LLVM 3.9.

v2: Enable the target, add libedit-dev, rework check target.

Cc: Tim Rowley <timothy.o.rowley at intel.com>
Cc: George Kyriazis <george.kyriazis at intel.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
Note!
With this the Travis instance seems to be having Internal Compiler Error
at various stages of the build. Both GCC5 and GCC6 are affected, yet the
Autotools build (coming later) seems unaffected.

Tim, George do you guys have some time to investigate the problem?
Alternatively we'll have to drop the patch for now :-(
---
 .travis.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6eb208ace24..aa2a55d7bb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,6 +82,32 @@ matrix:
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
+    - env:
+        - LABEL="scons SWR"
+        - BUILD=scons
+        - SCONS_TARGET="swr=1"
+        - SCONS_CHECK_COMMAND="true"
+        - LLVM_VERSION=3.9
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - OVERRIDE_CC=gcc-5
+        - OVERRIDE_CXX=g++-5
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-3.9
+          packages:
+            - scons
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            # From sources above
+            - g++-5
+            - llvm-3.9-dev
+            # Common
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
 
 install:
   - pip install --user mako
@@ -157,5 +183,7 @@ script:
     fi
 
   - if test "x$BUILD" = xscons; then
+      test $OVERRIDE_CC && export CC=$OVERRIDE_CC;
+      test $OVERRIDE_CXX && export CXX=$OVERRIDE_CXX;
       scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
     fi
-- 
2.12.2