mesa: extract helper function from _mesa_GetPointerv

[mesa.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 770ba8dbc2dcaa3d6087fa10b8c6712a95458d1a..6528b104667353acf3f90aa7f3963e6f3cbaae16 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,10 @@ 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
@@ -53,10 +53,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