From b6be3ea45b3bb260d475ba63620252ce2963c560 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 12 Nov 2016 18:30:39 +0100 Subject: patch 8.0.0080 Problem: The OS X build fails on Travis. Solution: Skip the virtual framebuffer on OS X. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index e9464aec97..d4472f20be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,11 +69,9 @@ before_install: # Lua is not installed on Travis OSX - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi -# Start virtual framebuffer to be able to test the GUI. +# Start virtual framebuffer to be able to test the GUI. Does not work on OS X. before_script: - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" - - sleep 3 # give xvfb some time to start + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && sleep 3; fi script: - NPROC=$(getconf _NPROCESSORS_ONLN) -- cgit v1.2.3