Mesa (staging/19.2): travis: Fail build if any command in if statement fails.

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: 6ac1d9b46e2b1478c0715c3ed84563b89b83dfb0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ac1d9b46e2b1478c0715c3ed84563b89b83dfb0

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Thu Aug 29 23:15:29 2019 -0700

travis: Fail build if any command in if statement fails.

Travis is checking the exit code of the entire if statement.

Fixes: 64ffc289be89 ("travis: add MacOS Scons build")
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Acked-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
(cherry picked from commit 029b07b2adbde4466e4776e10cf37ec30aee4f1f)

---

 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 770ba8dbc2d..97720cf118a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,10 +53,10 @@ install:
 script:
   - if test "x$BUILD" = xmeson; then
       meson _build -Dbuild-tests=true;
-      ninja -C _build;
-      ninja -C _build test;
+      ninja -C _build || travis_terminate 1;
+      ninja -C _build test || travis_terminate 1;
     fi
   - if test "x$BUILD" = xscons; then
-      scons;
-      scons check;
+      scons || travis_terminate 1;
+      scons check || travis_terminate 1;
     fi