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.

diff --git a/.travis.yml b/.travis.yml
index 3a012348e14427fb1498fce2c337dd6fa491a610..02a449b475b18d777d13fe35eaa3308236b7a5cc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,9 @@ compiler:
   - gcc
 
 env:
+  global:
+      # pretend to play sounds
+      AUDIODEV=null
   - &tiny-nogui
     BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
   - &tiny
@@ -121,6 +124,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.
@@ -128,8 +141,6 @@ before_script:
     if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
       export DISPLAY=:99.0
       sh -e /etc/init.d/xvfb start && sleep 3
-      # pretend to play sounds
-      export AUDIODEV=null
     fi
 
 script:

diff --git a/src/version.c b/src/version.c
index 4d77a5729c8b8fdb2f5411f94d8d129ea7a1665b..82e9e3842ff8c4cd9a9377359dd505ee7fd92ba1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1504,
 /**/
     1503,
 /**/