patch 8.1.1644: sound test does not work on Travis

Problem:    Sound test does not work on Travis.
Solution:   Use "sg" command to enable audio. (Ozaki Kiichi, closes #4624)

diff --git a/.travis.yml b/.travis.yml
index b669a908f612a5ef26c6df9a26c59442468af57e..77503084b08522480af9e8f9f07339b68ce168b4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,6 +75,7 @@ anchors:
       - sh -e /etc/init.d/xvfb start && sleep 3
       - sudo modprobe snd-dummy
       - sudo usermod -a -G audio $USER
+      - do_test() { sg audio "sg $(id -gn) '$*'"; }
 
   osx: &osx
     os: osx
@@ -91,6 +92,8 @@ anchors:
       - rvm reset
       # Lua is not installed on Travis OSX
       - export LUA_PREFIX=/usr/local
+    before_script:
+      - do_test() { "$@"; }
 
   coverage: &coverage
     - ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8 latin-1 EUC-KR
@@ -139,7 +142,7 @@ script:
       "${SRCDIR}"/vim --not-a-term -u NONE -S "${SRCDIR}"/testdir/if_ver-2.vim -c quit > /dev/null
       cat if_ver.txt
     fi
-  - make ${SHADOWOPT} ${TEST}
+  - do_test make ${SHADOWOPT} ${TEST}
   - echo -en "travis_fold:end:test\\r\\033[0K"
 
 # instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env),

diff --git a/src/version.c b/src/version.c
index c7e2a1633a3f0c7d9f043d89eefeef927a95fda1..754155bfd2f90cd2073df890135218c3033030c4 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 */
+/**/
+    1644,
 /**/
     1643,
 /**/