# HG changeset patch # User Bram Moolenaar # Date 1584357304 -3600 # Node ID c4062bd1ff4f0cd4383fdc67ed16475230e87a5e # Parent 1d074dc7260fe2d042c79088d96c09fb74be2f7c patch 8.2.0391: CI test coverage dropped Commit: https://github.com/vim/vim/commit/b2e1f8a28fab71c7ef38d39226967be8c3559590 Author: Bram Moolenaar Date: Mon Mar 16 12:09:30 2020 +0100 patch 8.2.0391: CI test coverage dropped Problem: CI test coverage dropped. Solution: Set $DISPLAY also for non-GUI builds. (James McCoy, closes https://github.com/vim/vim/issues/5788) diff --git a/.travis.yml b/.travis.yml --- a/.travis.yml +++ b/.travis.yml @@ -72,14 +72,16 @@ language: c ln -sf "$(which llvm-cov)" /home/travis/bin/gcov fi before_script: - # Start virtual framebuffer to be able to test the GUI. Does not work on OS X. - | - if [[ "${TEST}" =~ gui ]]; then + # Start virtual framebuffer to be able to test the GUI. For dists newer + # than trusty, the "services: xvfb" setting should be used instead + if [[ ${TRAVIS_DIST} = trusty ]]; then export DISPLAY=:99.0 sh -e /etc/init.d/xvfb start && sleep 3 fi - | - [ "${TRAVIS_CPU_ARCH}" = s390x ] || sudo modprobe snd-dummy + # Sound testing works without this in newer dists + [ ${TRAVIS_DIST} != trusty ] || sudo modprobe snd-dummy - sudo usermod -a -G audio $USER - do_test() { sg audio "sg $(id -gn) '$*'"; } @@ -213,6 +215,7 @@ jobs: compiler: gcc env: - *linux-huge + - COVERAGE=no addons: apt: packages: diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 391, +/**/ 390, /**/ 389,