etnaviv: drm: Don't miscalculate timeout

[mesa.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 770ba8dbc2dcaa3d6087fa10b8c6712a95458d1a..ab8e67e74bdbbd4ab0c740ec6851a69ea068fb9d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,14 +19,15 @@ matrix:
 before_install:
   - HOMEBREW_NO_AUTO_UPDATE=1 brew install expat gettext
   - if test "x$BUILD" = xmeson; then
-      HOMEBREW_NO_AUTO_UPDATE=1 brew install python3 ninja;
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja;
     fi
   - if test "x$BUILD" = xscons; then
-      HOMEBREW_NO_AUTO_UPDATE=1 brew install python2 scons;
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install scons;
     fi
 
   # Set PATH for homebrew pip3 installs
-  - PATH="$HOME/Library/Python/3.6/bin:${PATH}"
+  - PYTHON_VERSION=$(python3 -V | awk '{print $2}' | cut -d. -f1-2)
+  - PATH="$HOME/Library/Python/$PYTHON_VERSION/bin:${PATH}"
   # Set PKG_CONFIG_PATH for keg-only expat
   - PKG_CONFIG_PATH="/usr/local/opt/expat/lib/pkgconfig:${PKG_CONFIG_PATH}"
   # Set PATH for keg-only gettext
@@ -53,10 +54,11 @@ 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;
+      ninja -C _build install || travis_terminate 1;
     fi
   - if test "x$BUILD" = xscons; then
-      scons;
-      scons check;
+      scons force_scons=1 || travis_terminate 1;
+      scons force_scons=1 check || travis_terminate 1;
     fi