diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-07 15:12:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-07 15:12:12 +0200 |
| commit | 5b19e5b919ec568792e2e2301899f0e58cf9e550 (patch) | |
| tree | 42c94ab698d0ac61fe6fb60a1260b33dade25925 | |
| parent | 899f20deae22d8cfc89d88d5f1869e5191d4b360 (diff) | |
| download | vim-git-8.1.1644.tar.gz | |
patch 8.1.1644: sound test does not work on Travisv8.1.1644
Problem: Sound test does not work on Travis.
Solution: Use "sg" command to enable audio. (Ozaki Kiichi, closes #4624)
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b669a908f..77503084b 100644 --- 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 c7e2a1633..754155bfd 100644 --- 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 */ /**/ + 1644, +/**/ 1643, /**/ 1642, |