Skip to content

Commit ef23c52

Browse files
committed
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.
1 parent ffa60dd commit ef23c52

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

.travis.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ compiler:
1010
- gcc
1111

1212
env:
13+
global:
14+
# pretend to play sounds
15+
AUDIODEV=null
1316
- &tiny-nogui
1417
BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
1518
- &tiny
@@ -121,15 +124,23 @@ before_install:
121124
if [[ "${TRAVIS_OS_NAME}" = "linux" ]] && [[ "${CC}" = "clang" ]]; then
122125
ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
123126
fi
127+
# Should make sound work (might not all be needed)
128+
- |
129+
if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
130+
sudo apt-get update -qq
131+
sudo usermod -a -G audio travis
132+
sudo apt-get install -y portaudio19-dev
133+
sudo apt-get install -y libasound2-dev alsa-utils alsa-oss
134+
sudo bash test/prep-dummy-soundcard.sh
135+
sudo apt-get install -y lame
136+
fi
124137
125138
before_script:
126139
# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
127140
- |
128141
if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
129142
export DISPLAY=:99.0
130143
sh -e /etc/init.d/xvfb start && sleep 3
131-
# pretend to play sounds
132-
export AUDIODEV=null
133144
fi
134145
135146
script:

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ static char *(features[]) =
777777

778778
static int included_patches[] =
779779
{ /* Add new patch number below this line */
780+
/**/
781+
1504,
780782
/**/
781783
1503,
782784
/**/

0 commit comments

Comments
 (0)