X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.travis.yml;h=82c2088776c9915710530f5912ee7d1c925d7789;hb=63b823130dfe0be2670c83b365e7e997a1957c8b;hp=8cb7f8b95c1a99470fcfcd324145729550f2d311;hpb=31c162ad225161af2b8069cf7e2940a4bfc37456;p=mesa.git diff --git a/.travis.yml b/.travis.yml index 8cb7f8b95c1..82c2088776c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: - GLPROTO_VERSION=glproto-1.4.17 - DRI2PROTO_VERSION=dri2proto-2.8 - LIBPCIACCESS_VERSION=libpciaccess-0.13.4 - - LIBDRM_VERSION=libdrm-2.4.95 + - LIBDRM_VERSION=libdrm-2.4.97 - XCBPROTO_VERSION=xcb-proto-1.13 - RANDRPROTO_VERSION=randrproto-1.3.0 - LIBXRANDR_VERSION=libXrandr-1.3.0 @@ -32,45 +32,31 @@ env: matrix: include: - env: - - LABEL="meson Vulkan" - - BUILD=meson - - DRI_DRIVERS="" - - GALLIUM_DRIVERS="" - - VULKAN_DRIVERS="intel,amd" + - LABEL="make Vulkan" + - BUILD=make + - MAKEFLAGS="-j4" + - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" - LLVM_VERSION=7 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" + - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" + - DRI_DRIVERS="" + - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" + - GALLIUM_DRIVERS="" + - VULKAN_DRIVERS="intel,radeon" + - LIBUNWIND_FLAGS="--disable-libunwind" addons: apt: sources: - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' key_url: https://apt.llvm.org/llvm-snapshot.gpg.key packages: + # From sources above - llvm-7-dev # Common - xz-utils - libexpat1-dev - libx11-xcb-dev - libelf-dev - - python3.5 - - python3-pip - - python3-setuptools - - env: - - LABEL="meson loaders/classic DRI" - - BUILD=meson - - DRI_DRIVERS="i915,i965,r100,r200,swrast,nouveau" - - GALLIUM_DRIVERS="" - - VULKAN_DRIVERS="" - addons: - apt: - packages: - - xz-utils - - x11proto-xf86vidmode-dev - - libxxf86vm-dev - - libexpat1-dev - - libx11-xcb-dev - - libxdamage-dev - - libxfixes-dev - - python3.5 - python3-pip - python3-setuptools - env: @@ -163,7 +149,7 @@ matrix: - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,imx" + - GALLIUM_DRIVERS="i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: @@ -365,102 +351,16 @@ matrix: - libunwind8-dev - python3-pip - python3-setuptools - - env: - - LABEL="make Vulkan" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" - - LLVM_VERSION=7 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" - - DRI_DRIVERS="" - - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="" - - VULKAN_DRIVERS="intel,radeon" - - LIBUNWIND_FLAGS="--disable-libunwind" - addons: - apt: - sources: - - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' - key_url: https://apt.llvm.org/llvm-snapshot.gpg.key - packages: - # From sources above - - llvm-7-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="scons" - - BUILD=scons - - SCONSFLAGS="-j4" - # Explicitly disable. - - SCONS_TARGET="llvm=0" - # Keep it symmetrical to the make build. - - SCONS_CHECK_COMMAND="scons llvm=0 check" - addons: - apt: - packages: - # Common - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - env: - - LABEL="scons LLVM" - - BUILD=scons - - SCONSFLAGS="-j4" - - SCONS_TARGET="llvm=1" - # Keep it symmetrical to the make build. - - SCONS_CHECK_COMMAND="scons llvm=1 check" - - LLVM_VERSION=3.5 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - addons: - apt: - packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev - # We actually want to test against llvm-3.3, yet 3.5 is available - - llvm-3.5-dev - # Common - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - env: - - LABEL="scons SWR" - - BUILD=scons - - SCONSFLAGS="-j4" - - SCONS_TARGET="swr=1" - - LLVM_VERSION=6.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - # Keep it symmetrical to the make build. There's no actual SWR, yet. - - SCONS_CHECK_COMMAND="true" - addons: - apt: - packages: - - llvm-6.0-dev - # Common - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - 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 + - DRI_LOADERS="-Dplatforms=x11" + - GALLIUM_DRIVERS=swrast os: osx before_install: @@ -499,12 +399,6 @@ install: 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). @@ -610,10 +504,13 @@ install: script: - if test "x$BUILD" = xmake; then export CFLAGS="$CFLAGS -isystem`pwd`"; + export MAKEFLAGS="-j4"; mkdir build && cd build && - ../autogen.sh --enable-debug + ../autogen.sh + --enable-autotools + --enable-debug $LIBUNWIND_FLAGS $DRI_LOADERS --with-dri-drivers=$DRI_DRIVERS @@ -625,32 +522,27 @@ script: make && eval $MAKE_CHECK_COMMAND; fi - - if test "x$BUILD" = xscons; then - scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND; - fi - - | if test "x$BUILD" = xmeson; then - - if test "x$TRAVIS_OS_NAME" == xosx; then - MESON_OPTIONS="-Degl=false" - fi - - if test "x$TRAVIS_OS_NAME" == xlinux; then - MESON_OPTIONS="-Ddri-drivers=${DRI_DRIVERS:-[]} -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} -Dvulkan-drivers=${VULKAN_DRIVERS:-[]}" + 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 - # 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 - export CFLAGS="$CFLAGS -isystem`pwd`" - meson _build $MESON_OPTIONS \ + meson _build \ --native-file=native.file \ - -Dbuild-tests=true + -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