From: Eric Anholt <eric@anholt.net>
Date: Tue, 1 Dec 2015 19:57:49 +0000 (-0800)
Subject: travis: Add a test build with scons.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=18f8da7865ddc27e4bb17f935c826f803bdfd5ba;p=mesa.git

travis: Add a test build with scons.

Since I just broke the scons build, I figured I'd make Travis test that I
don't break it again in the future.  The script runs the builds in
parallel across VMs, so it still takes just 5 minutes to turn around
results.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
---

diff --git a/.travis.yml b/.travis.yml
index 31cd5c27ecb..da1d81e1b46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ addons:
       - libxcb-dri2-0-dev
       - libx11-xcb-dev
       - llvm-3.4-dev
+      - scons
 
 env:
   global:
@@ -32,6 +33,9 @@ env:
     - LIBXCB_VERSION=libxcb-1.11
     - LIBXSHMFENCE_VERSION=libxshmfence-1.2
     - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
+  matrix:
+    - BUILD=make
+    - BUILD=scons
 
 install:
   - export PATH="/usr/lib/ccache:$PATH"
@@ -84,9 +88,14 @@ install:
 # with "undefined reference to `clock_gettime'" and "undefined
 # reference to `setupterm'" in llvmpipe.
 script:
-  - ./autogen.sh --enable-debug
-    --disable-gallium-llvm
-    --with-egl-platforms=x11,drm
-    --with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
-    --with-gallium-drivers=svga,swrast,vc4,virgl
-  - make && make check
+  - if test "x$BUILD" = xmake; then
+      ./autogen.sh --enable-debug
+        --disable-gallium-llvm
+        --with-egl-platforms=x11,drm
+        --with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
+        --with-gallium-drivers=svga,swrast,vc4,virgl
+        ;
+      make && make check;
+    elif test x$BUILD = xscons; then
+      scons;
+    fi