[Mesa-dev] [PATCH 13/16] travis: model scons check target like the make one

[Emil Velikov]

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

Should make things a bit more consistent across the board.

Cc: Eric Engestrom <eric at engestrom.ch>
CC: Andres Gomez <agomez at igalia.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5298fa11b67..ec76cf7c9cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -130,6 +130,8 @@ matrix:
         - SCONSFLAGS="-j4"
         # Explicitly disable.
         - SCONS_TARGET="llvm=0"
+        # Keep it symmetrical to the make build.
+        - SCONS_CHECK_COMMAND="scons llvm=0 check"
       addons:
         apt:
           packages:
@@ -144,6 +146,8 @@ matrix:
         - BUILD=scons
         - SCONSFLAGS="-j4"
         - SCONS_TARGET="llvm=1"
+        # Keep it symmetrical to the make build.
+        - SCONS_CHECK_COMMAND="scons llvm=1 check"
         - LLVM_VERSION=3.3
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
       addons:
@@ -165,6 +169,8 @@ matrix:
         - SCONS_TARGET="swr=1"
         - LLVM_VERSION=3.9
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        # Keep it symmetrical to the make build. There's no actual SWR, yet.
+        - SCONS_CHECK_COMMAND="true"
         - OVERRIDE_CC="gcc-5"
         - OVERRIDE_CXX="g++-5"
       addons:
@@ -278,5 +284,5 @@ script:
   - if test "x$BUILD" = xscons; then
       test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC";
       test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
-      scons $SCONS_TARGET && scons $SCONS_TARGET check;
+      scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
     fi
-- 
2.12.2