diff options
| author | Juan A. Suarez Romero <[email protected]> | 2018-08-08 13:27:32 +0200 |
|---|---|---|
| committer | Juan A. Suarez Romero <[email protected]> | 2018-08-08 17:56:32 +0200 |
| commit | f9d0e7d3bcd831d52af6a6c46aac4ed4590a8615 (patch) | |
| tree | d58437b35584795ce89c73c9adfb91580c180a24 | |
| parent | 51e878cdb3bf05a7818fce701b66ad7e3d9e9687 (diff) | |
travis: make drivers explicit in Meson targets
Like in the autotools target, make the list of drivers to be built in
each of the Meson targets explicit.
This will help to identify missing dependencies and other issues more
easily.
CC: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 9f91d2c9b69..430c159c9c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,9 @@ matrix: - env: - LABEL="meson Vulkan" - BUILD=meson - - MESON_OPTIONS="-Ddri-drivers=[] -Dgallium-drivers=[]" + - DRI_DRIVERS="" + - GALLIUM_DRIVERS="" + - VULKAN_DRIVERS="intel,amd" - LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" addons: @@ -55,7 +57,9 @@ matrix: - env: - LABEL="meson loaders/classic DRI" - BUILD=meson - - MESON_OPTIONS="-Dvulkan-drivers=[] -Dgallium-drivers=[]" + - DRI_DRIVERS="i915,i965,r100,r200,swrast,nouveau" + - GALLIUM_DRIVERS="" + - VULKAN_DRIVERS="" addons: apt: packages: @@ -463,7 +467,6 @@ matrix: - env: - LABEL="macOS meson" - BUILD=meson - - MESON_OPTIONS="-Degl=false" os: osx before_install: @@ -647,6 +650,14 @@ script: - | 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:-[]}" + fi + # Travis CI has moved to LLVM 5.0, and meson is detecting # automatically the available version in /usr/local/bin based on # the PATH env variable order preference. |