patch 8.2.1487: Travis: installing snd-dummy is not always useful

Problem:    Travis: installing snd-dummy is not always useful.
Solution:   Only install snd-dummy on amd64. (Ozaki Kiichi, closes #6738)
This commit is contained in:
Bram Moolenaar 2020-08-19 19:46:12 +02:00
parent f8abbf37d6
commit a7c4e74763
3 changed files with 15 additions and 9 deletions

View File

@ -69,7 +69,11 @@ _anchors:
fi
before_script:
- sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
- sudo bash ci/load-snd-dummy.sh || true
# It appears we can load "snd-dummy" on only amd64.
- |
if [[ "${TRAVIS_CPU_ARCH}" = amd64 ]]; then
sudo bash ci/load-snd-dummy.sh || true
fi
- sudo usermod -a -G audio $USER
- do_test() { sg audio "sg $(id -gn) '$*'"; }
@ -208,13 +212,13 @@ jobs:
env:
- *normal
- *shadowopt
# Temporarily disabled, always fails
#- <<: *linux
# arch: s390x
# name: huge/gcc-s390x
# compiler: gcc
# env: *linux-huge
# services: []
# Temporarily disabled, always fails
#- <<: *linux
# arch: s390x
# name: huge/gcc-s390x
# compiler: gcc
# env: *linux-huge
# services: []
- <<: *linux
arch: arm64
name: huge/gcc-arm64

View File

@ -3,6 +3,6 @@ set -e
if ! modprobe snd-dummy; then
# snd-dummy is contained in linux-modules-extra (if exists)
apt install -y "linux-modules-extra-$(uname -r)"
apt-get install -yq --no-install-suggests --no-install-recommends "linux-modules-extra-$(uname -r)"
modprobe snd-dummy
fi

View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1487,
/**/
1486,
/**/