mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.1.1504: sound test still fails on Travis
Problem: Sound test still fails on Travis. Solution: Add more lines to the install section.
This commit is contained in:
15
.travis.yml
15
.travis.yml
@@ -10,6 +10,9 @@ compiler:
|
|||||||
- gcc
|
- gcc
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
global:
|
||||||
|
# pretend to play sounds
|
||||||
|
AUDIODEV=null
|
||||||
- &tiny-nogui
|
- &tiny-nogui
|
||||||
BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
|
BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
|
||||||
- &tiny
|
- &tiny
|
||||||
@@ -121,6 +124,16 @@ before_install:
|
|||||||
if [[ "${TRAVIS_OS_NAME}" = "linux" ]] && [[ "${CC}" = "clang" ]]; then
|
if [[ "${TRAVIS_OS_NAME}" = "linux" ]] && [[ "${CC}" = "clang" ]]; then
|
||||||
ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
|
ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
|
||||||
fi
|
fi
|
||||||
|
# Should make sound work (might not all be needed)
|
||||||
|
- |
|
||||||
|
if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
|
||||||
|
sudo apt-get update -qq
|
||||||
|
sudo usermod -a -G audio travis
|
||||||
|
sudo apt-get install -y portaudio19-dev
|
||||||
|
sudo apt-get install -y libasound2-dev alsa-utils alsa-oss
|
||||||
|
sudo bash test/prep-dummy-soundcard.sh
|
||||||
|
sudo apt-get install -y lame
|
||||||
|
fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
|
# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
|
||||||
@@ -128,8 +141,6 @@ before_script:
|
|||||||
if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
|
if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; 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
|
||||||
# pretend to play sounds
|
|
||||||
export AUDIODEV=null
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
@@ -777,6 +777,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 */
|
||||||
|
/**/
|
||||||
|
1504,
|
||||||
/**/
|
/**/
|
||||||
1503,
|
1503,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user