wsi: deduplicate get_current_time() functions between display and x11

[mesa.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f061ad5ac5066571b63a77d85713a4218ce84001..382c2efcf76bdd1a2aad1228d742c5bfdef0d837 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,21 +5,21 @@ dist: xenial
 cache:
   ccache: true
 
+env:
+  global:
+    - PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+
 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"
       os: osx
 
 before_install:
@@ -64,21 +64,20 @@ install:
 script:
   - if test "x$BUILD" = xmake; then
       export CFLAGS="$CFLAGS -isystem`pwd`";
+      export MAKEFLAGS="-j4";
 
       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;
+      make && make check;
     fi
 
   - |
@@ -98,10 +97,8 @@ script:
       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