summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-11-11 21:57:45 +0100
committerBram Moolenaar <Bram@vim.org>2016-11-11 21:57:45 +0100
commite3505dfc858260a21f2bbc6056f5769dea2f273d (patch)
treede3aea60f3879026bfd1039fe0f4d2727e5f79ce
parent79cbdcb1eeead00bad6fc64ab4a53e5860d5a663 (diff)
downloadvim-git-e3505dfc858260a21f2bbc6056f5769dea2f273d.tar.gz
patch 8.0.0077v8.0.0077
Problem: The GUI code is not tested by Travis. Solution: Install the virtual framebuffer.
-rw-r--r--.travis.yml6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 0acbf90ea..e9464aec9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,12 @@ 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.
+before_script:
+ - "export DISPLAY=:99.0"
+ - "sh -e /etc/init.d/xvfb start"
+ - sleep 3 # give xvfb some time to start
+
script:
- NPROC=$(getconf _NPROCESSORS_ONLN)
- if [ "$CHECK_AUTOCONF" = "yes" -a "$CC" = "gcc" ]; then make -C src autoconf; fi
diff --git a/src/version.c b/src/version.c
index 1707ec4ed..9f3810ef8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 77,
+/**/
76,
/**/
75,