Skip to content

Commit a90998d

Browse files
committed
patch 8.1.1507: sound test still fails on Travis
Problem: Sound test still fails on Travis. Solution: Try another dummy sound approach.
1 parent b29cfb8 commit a90998d

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

.travis.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,25 +121,16 @@ before_install:
121121
if [[ "${TRAVIS_OS_NAME}" = "linux" ]] && [[ "${CC}" = "clang" ]]; then
122122
ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
123123
fi
124-
# Should make sound work (might not all be needed)
125-
- |
126-
if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
127-
sudo apt-get update -qq
128-
sudo usermod -a -G audio travis
129-
sudo apt-get install -y portaudio19-dev
130-
sudo apt-get install -y libasound2-dev alsa-utils alsa-oss
131-
sudo bash test/prep-dummy-soundcard.sh
132-
sudo apt-get install -y lame
133-
fi
134124
135125
before_script:
136126
# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
127+
# Install dummy device for sound.
137128
- |
138129
if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
139130
export DISPLAY=:99.0
140131
sh -e /etc/init.d/xvfb start && sleep 3
141-
# pretend to play sound
142-
export AUDIODEV=null
132+
sudo modprobe snd-dummy
133+
sudo usermod -a -G audio $USER
143134
fi
144135
145136
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+
1507,
780782
/**/
781783
1506,
782784
/**/

0 commit comments

Comments
 (0)