st/nine: Track constant slots used

[mesa.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7a684e37d004faf1c6851359e65e3d763c08b913..18f114b7cc8bd147db339ad1e58c2dac306e703b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,19 +31,11 @@ env:
 
 matrix:
   include:
-    - env:
-        - LABEL="macOS make"
-        - BUILD=make
-        - MAKEFLAGS="-j4"
-        - MAKE_CHECK_COMMAND="make check"
-        - DRI_LOADERS="--with-platforms=x11 --disable-egl"
-      os: osx
     - env:
         - LABEL="macOS meson"
         - BUILD=meson
-        - UNWIND="false"
-        - DRI_LOADERS="-Dglx=dri -Dgbm=false -Degl=false -Dplatforms=x11 -Dosmesa=none"
-        - GALLIUM_ST="-Ddri3=true -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled"
+        - DRI_LOADERS="-Dplatforms=x11"
+        - GALLIUM_DRIVERS=swrast
       os: osx
 
 before_install:
@@ -77,17 +69,6 @@ install:
       pip3 install --user mako;
     fi
 
-  # Install autotools build dependencies
-  - if test "x$BUILD" = xmake; then
-      pip2 install --user mako;
-    fi
-
-  # Install a more modern scons from pip.
-  - if test "x$BUILD" = xscons; then
-      pip2 install --user "scons>=2.4";
-      pip2 install --user mako;
-    fi
-
   # Install dependencies where we require specific versions (or where
   # disallowed by Travis CI's package whitelisting).
 
@@ -191,53 +172,27 @@ install:
     fi
 
 script:
-  - if test "x$BUILD" = xmake; then
-      export CFLAGS="$CFLAGS -isystem`pwd`";
-
-      mkdir build &&
-      cd build &&
-      ../autogen.sh
-        --enable-autotools
-        --enable-debug
-        $LIBUNWIND_FLAGS
-        $DRI_LOADERS
-        --with-dri-drivers=$DRI_DRIVERS
-        $GALLIUM_ST
-        --with-gallium-drivers=$GALLIUM_DRIVERS
-        --with-vulkan-drivers=$VULKAN_DRIVERS
-        --disable-llvm-shared-libs
-        &&
-      make && eval $MAKE_CHECK_COMMAND;
-    fi
-
-  - if test "x$BUILD" = xscons; then
-      scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
+  if test "x$BUILD" = xmeson; then
+    if test -n "$LLVM_CONFIG"; then
+      # We need to control the version of llvm-config we're using, so we'll
+      # generate a native file to do so. This requires meson >=0.49
+      #
+      echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file
+
+      $LLVM_CONFIG --version
+    else
+      : > native.file
     fi
 
-  - |
-    if test "x$BUILD" = xmeson; then
-      if test -n "$LLVM_CONFIG"; then
-        # We need to control the version of llvm-config we're using, so we'll
-        # generate a native file to do so. This requires meson >=0.49
-        #
-        echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file
-
-        $LLVM_CONFIG --version
-      else
-        : > native.file
-      fi
-
-      export CFLAGS="$CFLAGS -isystem`pwd`"
-      meson _build \
-                   --native-file=native.file \
-                   -Dbuild-tests=true \
-                   -Dlibunwind=${UNWIND} \
-                   ${DRI_LOADERS} \
-                   -Ddri-drivers=${DRI_DRIVERS:-[]} \
-                   ${GALLIUM_ST} \
-                   -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} \
-                   -Dvulkan-drivers=${VULKAN_DRIVERS:-[]}
-      meson configure _build
-      ninja -C _build
-      ninja -C _build test
-    fi
+    export CFLAGS="$CFLAGS -isystem`pwd`"
+    meson _build \
+                  --native-file=native.file \
+                  -Dbuild-tests=true \
+                  ${DRI_LOADERS} \
+                  -Ddri-drivers=${DRI_DRIVERS:-[]} \
+                  -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} \
+                  -Dvulkan-drivers=${VULKAN_DRIVERS:-[]}
+    meson configure _build
+    ninja -C _build
+    ninja -C _build test
+  fi