forked from aniani/vim
patch 8.0.0080
Problem: The OS X build fails on Travis. Solution: Skip the virtual framebuffer on OS X.
This commit is contained in:
parent
2b946c9f9b
commit
b6be3ea45b
@ -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)
|
||||
|
@ -764,6 +764,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
80,
|
||||
/**/
|
||||
79,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user