diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2017-09-27 10:37:28 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2017-10-03 10:02:08 -0700 |
| commit | df82012b2cbac47694a490738c5e6a33e3a69ee3 (patch) | |
| tree | a2ed518a089a577baa8870fc85ba21b9db8d1ff4 /.travis.yml | |
| parent | 7a5a986ddd88487a42847f00f46f7bb0a542c988 (diff) | |
travis: add meson build for vulkan drivers.
v2: - use -isystem`pwd` instead of cp to include fake linux header
(Eric E., Emil)
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 088295e1334..2c87f60ec12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ env: - WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.8 - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig:$HOME/prefix/share/pkgconfig - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH" + - PATH="$HOME/prefix/bin:$PATH" matrix: include: @@ -392,10 +393,34 @@ matrix: - libexpat1-dev - libx11-xcb-dev - libelf-dev + - env: + - LABEL="meson Vulkan" + - BUILD=meson + - MESON_OPTIONS="-Dbuild-tests=true" + addons: + apt: + sources: + - llvm-toolchain-trusty-3.9 + packages: + # LLVM packaging is broken and misses these dependencies + - libedit-dev + # From sources above + - llvm-3.9-dev + # Common + - xz-utils + - libexpat1-dev + - libelf-dev + - python3-pip install: - pip install --user mako + # Install the latest meson from pip, since the version in the ubuntu repos is + # often quite old. + - if test "x$BUILD" = xmeson; then + pip3 install --user meson; + fi + # Since libdrm gets updated in configure.ac regularly, try to pick up the # latest version from there. - for line in `grep "^LIBDRM.*_REQUIRED=" configure.ac`; do @@ -457,6 +482,11 @@ install: - tar -axvf $WAYLAND_PROTOCOLS_VERSION.tar.xz - (cd $WAYLAND_PROTOCOLS_VERSION && ./configure --prefix=$HOME/prefix && make install) + # Meson requires ninja >= 1.6, but trusty has 1.3.x + - wget https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-linux.zip; + - unzip ninja-linux.zip + - mv ninja $HOME/prefix/bin/ + # Generate the header since one is missing on the Travis instance - mkdir -p linux - printf "%s\n" \ @@ -496,3 +526,9 @@ script: test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX"; scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND; fi + + - if test "x$BUILD" = xmeson; then + export CC="$CC -isystem`pwd`"; + meson _build $MESON_OPTIONS; + ninja -C _build test; + fi |