Permalink
Browse files

patch 8.0.0080

Problem:    The OS X build fails on Travis.
Solution:   Skip the virtual framebuffer on OS X.
  • Loading branch information...
1 parent 2b946c9 commit b6be3ea45b3bb260d475ba63620252ce2963c560 @brammool brammool committed Nov 12, 2016
Showing with 4 additions and 4 deletions.
  1. +2 −4 .travis.yml
  2. +2 −0 src/version.c
View
@@ -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)
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 80,
+/**/
79,
/**/
78,

0 comments on commit b6be3ea

Please sign in to comment.