changeset 17014:eca47d76ad5a v8.1.1507

patch 8.1.1507: sound test still fails on Travis commit https://github.com/vim/vim/commit/a90998d93a6e8deb686dd67a73288db2ca08dc89 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 9 15:21:27 2019 +0200 patch 8.1.1507: sound test still fails on Travis Problem: Sound test still fails on Travis. Solution: Try another dummy sound approach.
author Bram Moolenaar <Bram@vim.org>
date Sun, 09 Jun 2019 15:30:05 +0200
parents 0357c42d29fc
children bc44dd816fc0
files .travis.yml src/version.c
diffstat 2 files changed, 5 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml
+++ b/.travis.yml
@@ -121,25 +121,16 @@ before_install:
     if [[ "${TRAVIS_OS_NAME}" = "linux" ]] && [[ "${CC}" = "clang" ]]; then
       ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
     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:
   # Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
+  # Install dummy device for sound.
   - |
     if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
       export DISPLAY=:99.0
       sh -e /etc/init.d/xvfb start && sleep 3
-      # pretend to play sound
-      export AUDIODEV=null
+      sudo modprobe snd-dummy
+      sudo usermod -a -G audio $USER
     fi
 
 script:
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1507,
+/**/
     1506,
 /**/
     1505,