st/mesa: don't assign prog->ShadowSamplers

[mesa.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 2c87f60ec12c7a287a2cc031c3e46a258794f1a6..d16d6b3c25a009826ec468ff8fa1b32e0a39f16a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -396,7 +396,7 @@ matrix:
     - env:
         - LABEL="meson Vulkan"
         - BUILD=meson
-        - MESON_OPTIONS="-Dbuild-tests=true"
+        - MESON_OPTIONS="-Ddri-drivers="
       addons:
         apt:
           sources:
@@ -411,6 +411,20 @@ matrix:
             - libexpat1-dev
             - libelf-dev
             - python3-pip
+    - env:
+        - LABEL="meson loaders/classic DRI"
+        - BUILD=meson
+        - MESON_OPTIONS="-Dvulkan-drivers="
+      addons:
+        apt:
+          packages:
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libxdamage-dev
+            - libxfixes-dev
+            - python3-pip
 
 install:
   - pip install --user mako
@@ -507,7 +521,7 @@ script:
       test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
       test -n "$OVERRIDE_PATH" && export PATH="$OVERRIDE_PATH:$PATH";
 
-      export CC="$CC -isystem`pwd`";
+      export CFLAGS="$CFLAGS -isystem`pwd`";
 
       ./autogen.sh --enable-debug
         $LIBUNWIND_FLAGS
@@ -528,7 +542,7 @@ script:
     fi
 
   - if test "x$BUILD" = xmeson; then
-      export CC="$CC -isystem`pwd`";
+      export CFLAGS="$CFLAGS -isystem`pwd`";
       meson _build $MESON_OPTIONS;
-      ninja -C _build test;
+      ninja -C _build;
     fi