travis: Test xvfb on xenial and bionic.

This commit is contained in:
orbea 2019-10-08 08:18:19 -07:00 committed by Rafael Kitover
parent 4e9882f24d
commit 675072f025
1 changed files with 6 additions and 6 deletions

View File

@ -8,12 +8,10 @@ sudo: required
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- env: BUILD_ENV=ubuntu-bionic - env: BUILD_ENV=ubuntu-bionic XVFB_RUN=1
dist: bionic dist: bionic
# xvfb fails on bionic for some reason - env: BUILD_ENV=ubuntu-xenial XVFB_RUN=1
- env: BUILD_ENV=ubuntu-xenial
dist: xenial dist: xenial
# xvfb fails on xenial too
- env: BUILD_ENV=ubuntu-trusty XVFB_RUN=1 - env: BUILD_ENV=ubuntu-trusty XVFB_RUN=1
- env: BUILD_ENV=ubuntu-trusty XVFB_RUN=1 CC=clang CXX=clang++ - env: BUILD_ENV=ubuntu-trusty XVFB_RUN=1 CC=clang CXX=clang++
- env: BUILD_ENV=mingw-w64 - env: BUILD_ENV=mingw-w64
@ -62,9 +60,10 @@ script:
- if [ "$BUILD_ENV" != libretro ]; then make install DESTDIR=/tmp/VBAM; fi - if [ "$BUILD_ENV" != libretro ]; then make install DESTDIR=/tmp/VBAM; fi
- | - |
if [ -n "$XVFB_RUN" ]; then if [ -n "$XVFB_RUN" ]; then
xvfb-run ./visualboyadvance-m --help xvfb-run -a ./$PRGNAM --help
# TODO: --help crashes on OSX sometimes.
#elif [ "$BUILD_ENV" = mac ]; then #elif [ "$BUILD_ENV" = mac ]; then
# - ./visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m --help # ./$PRGNAM.app/Contents/MacOS/$PRGNAM --help
fi fi
env: env:
@ -72,6 +71,7 @@ env:
- CMAKE_ARGS="" - CMAKE_ARGS=""
- ENABLE_SDL=1 - ENABLE_SDL=1
- MAKEFLAGS="-j2" - MAKEFLAGS="-j2"
- PRGNAM=visualboyadvance-m
notifications: notifications:
webhooks: webhooks: