riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tests: add socat dependency for tests 

We only use it for test-io-channel-command at the moment.
Unfortunately bringing socat into CI exposed an existing bug in the
test-io-channel-command unit test so we disabled it for MacOS in the
previous patch.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230228190653.1602033-3-alex.bennee@linaro.org>
pull/232/head
Alex Bennée 3 years ago
parent
a6d715116f
commit
ab4c136109
20 changed files with 20 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitlab-ci.d/cirrus/freebsd-12.vars
  2. 2
      .gitlab-ci.d/cirrus/freebsd-13.vars
  3. 2
      .gitlab-ci.d/cirrus/macos-12.vars
  4. 1
      tests/docker/dockerfiles/alpine.docker
  5. 1
      tests/docker/dockerfiles/centos8.docker
  6. 1
      tests/docker/dockerfiles/debian-amd64-cross.docker
  7. 1
      tests/docker/dockerfiles/debian-amd64.docker
  8. 1
      tests/docker/dockerfiles/debian-arm64-cross.docker
  9. 1
      tests/docker/dockerfiles/debian-armel-cross.docker
  10. 1
      tests/docker/dockerfiles/debian-armhf-cross.docker
  11. 1
      tests/docker/dockerfiles/debian-mips64el-cross.docker
  12. 1
      tests/docker/dockerfiles/debian-mipsel-cross.docker
  13. 1
      tests/docker/dockerfiles/debian-ppc64el-cross.docker
  14. 1
      tests/docker/dockerfiles/debian-s390x-cross.docker
  15. 1
      tests/docker/dockerfiles/fedora-win32-cross.docker
  16. 1
      tests/docker/dockerfiles/fedora-win64-cross.docker
  17. 1
      tests/docker/dockerfiles/fedora.docker
  18. 1
      tests/docker/dockerfiles/opensuse-leap.docker
  19. 1
      tests/docker/dockerfiles/ubuntu2004.docker
  20. 1
      tests/lcitool/projects/qemu.yml

2
.gitlab-ci.d/cirrus/freebsd-12.vars
View File

@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd'
PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 zstd'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'

2
.gitlab-ci.d/cirrus/freebsd-13.vars
View File

@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd'
PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 zstd'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'

2
.gitlab-ci.d/cirrus/macos-12.vars
View File

@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew'
PIP3='/opt/homebrew/bin/pip3'
PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract usbredir vde vte3 zlib zstd'
PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract usbredir vde vte3 zlib zstd'
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme'
PYTHON='/opt/homebrew/bin/python3'

1
tests/docker/dockerfiles/alpine.docker
View File

@ -94,6 +94,7 @@ RUN apk update && \
sed \
snappy-dev \
sndio-dev \
socat \
sparse \
spice-dev \
spice-protocol \

1
tests/docker/dockerfiles/centos8.docker
View File

@ -103,6 +103,7 @@ RUN dnf distro-sync -y && \
rpm \
sed \
snappy-devel \
socat \
spice-protocol \
spice-server-devel \
systemd-devel \

1
tests/docker/dockerfiles/debian-amd64-cross.docker
View File

@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
tar \
tesseract-ocr \

1
tests/docker/dockerfiles/debian-amd64.docker
View File

@ -120,6 +120,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
systemtap-sdt-dev \
tar \

1
tests/docker/dockerfiles/debian-arm64-cross.docker
View File

@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
tar \
tesseract-ocr \

1
tests/docker/dockerfiles/debian-armel-cross.docker
View File

@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
tar \
tesseract-ocr \

1
tests/docker/dockerfiles/debian-armhf-cross.docker
View File

@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
tar \
tesseract-ocr \

1
tests/docker/dockerfiles/debian-mips64el-cross.docker
View File

@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
tar \
tesseract-ocr \

1
tests/docker/dockerfiles/debian-mipsel-cross.docker
View File

@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
tar \
tesseract-ocr \

1
tests/docker/dockerfiles/debian-ppc64el-cross.docker
View File

@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
tar \
tesseract-ocr \

1
tests/docker/dockerfiles/debian-s390x-cross.docker
View File

@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
tar \
tesseract-ocr \

1
tests/docker/dockerfiles/fedora-win32-cross.docker
View File

@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \
python3-sphinx_rtd_theme \
rpm \
sed \
socat \
sparse \
spice-protocol \
tar \

1
tests/docker/dockerfiles/fedora-win64-cross.docker
View File

@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \
python3-sphinx_rtd_theme \
rpm \
sed \
socat \
sparse \
spice-protocol \
tar \

1
tests/docker/dockerfiles/fedora.docker
View File

@ -113,6 +113,7 @@ exec "$@"' > /usr/bin/nosync && \
rpm \
sed \
snappy-devel \
socat \
sparse \
spice-protocol \
spice-server-devel \

1
tests/docker/dockerfiles/opensuse-leap.docker
View File

@ -97,6 +97,7 @@ RUN zypper update -y && \
sed \
snappy-devel \
sndio-devel \
socat \
sparse \
spice-protocol-devel \
systemd-devel \

1
tests/docker/dockerfiles/ubuntu2004.docker
View File

@ -119,6 +119,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
systemtap-sdt-dev \
tar \

1
tests/lcitool/projects/qemu.yml
View File

@ -101,6 +101,7 @@ packages:
- sed
- snappy
- sndio
- socat
- sparse
- spice-protocol
- spice-server

Write Preview
Loading…
Cancel
Save