diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-04-28 19:01:33 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-04-29 13:39:40 +0100 |
| commit | b3f2076549ec2bf13ee8bca965d3bf887abb6f20 (patch) | |
| tree | 3410304f55b2fc5e3269d63956f147c6ba421c4e /.travis.yml | |
| parent | 7e2af374742f6f387cada8c3e1e8585be3831405 (diff) | |
travis: model scons check target like the make one
Should make things a bit more consistent across the board.
Cc: Eric Engestrom <eric@engestrom.ch>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b806237a94..0e35b6e275 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,6 +132,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: @@ -146,6 +148,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: @@ -167,6 +171,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: @@ -281,5 +287,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 |