X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.travis.yml;h=23cb24fac161222a3fe5ad6c69a47e9dffec0708;hb=f93bc14618ae22a3d3b8030be6ba58d589f0bab8;hp=f7d372e0b2e206a067e2c0ffa477efdeed4095fc;hpb=8a1e8036430eb7fbfca8c17cb16dc39e94da248b;p=mesa.git

diff --git a/.travis.yml b/.travis.yml
index f7d372e0b2e..23cb24fac16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,22 @@ env:
   global:
     - PKG_CONFIG_PATH=""
 
+matrix:
+  include:
+    - env:
+      - BUILD=meson
+    - env:
+      - BUILD=scons
+
 before_install:
-  - HOMEBREW_NO_AUTO_UPDATE=1 brew install python3 ninja expat gettext
+  - HOMEBREW_NO_AUTO_UPDATE=1 brew install expat gettext
+  - if test "x$BUILD" = xmeson; then
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja;
+    fi
+  - if test "x$BUILD" = xscons; then
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install scons;
+    fi
+
   # Set PATH for homebrew pip3 installs
   - PATH="$HOME/Library/Python/3.6/bin:${PATH}"
   # Set PKG_CONFIG_PATH for keg-only expat
@@ -28,10 +42,22 @@ before_install:
   - PKG_CONFIG_PATH="/opt/X11/share/pkgconfig:/opt/X11/lib/pkgconfig:${PKG_CONFIG_PATH}"
 
 install:
-  - pip3 install --user meson
-  - pip3 install --user mako
+  - if test "x$BUILD" = xmeson; then
+      pip3 install --user meson;
+      pip3 install --user mako;
+    fi
+  - if test "x$BUILD" = xscons; then
+      pip2 install --user mako;
+    fi
 
 script:
-  - meson _build -Dbuild-tests=true
-  - ninja -C _build
-  - ninja -C _build test
+  - if test "x$BUILD" = xmeson; then
+      meson _build -Dbuild-tests=true;
+      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 || travis_terminate 1;
+      scons check || travis_terminate 1;
+    fi