patch 8.2.0391: CI test coverage dropped

Problem:    CI test coverage dropped.
Solution:   Set $DISPLAY also for non-GUI builds. (James McCoy, closes #5788)

diff --git a/.travis.yml b/.travis.yml
index a4fc6dda2ced8c646a86773691296fa68f5b40b6..28aea19807fa616f3b1e251f1ddbd791202f48b8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,14 +72,16 @@ _anchors:
           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
index 33bdb39bb62aed334d4745e983a1efa1d480cae5..78d89402a1e6b079e9c7e56feb8fbfb468dd4ffe 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    391,
 /**/
     390,
 /**/