forked from aniani/vim
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)
This commit is contained in:
@@ -72,14 +72,16 @@ _anchors:
|
|||||||
ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
|
ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
|
||||||
fi
|
fi
|
||||||
before_script:
|
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
|
export DISPLAY=:99.0
|
||||||
sh -e /etc/init.d/xvfb start && sleep 3
|
sh -e /etc/init.d/xvfb start && sleep 3
|
||||||
fi
|
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
|
- sudo usermod -a -G audio $USER
|
||||||
- do_test() { sg audio "sg $(id -gn) '$*'"; }
|
- do_test() { sg audio "sg $(id -gn) '$*'"; }
|
||||||
|
|
||||||
@@ -213,6 +215,7 @@ jobs:
|
|||||||
compiler: gcc
|
compiler: gcc
|
||||||
env:
|
env:
|
||||||
- *linux-huge
|
- *linux-huge
|
||||||
|
- COVERAGE=no
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
|
|||||||
@@ -738,6 +738,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
391,
|
||||||
/**/
|
/**/
|
||||||
390,
|
390,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user