[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/12] tests: add socat dependency for tests
From: |
Alex Bennée |
Subject: |
[PATCH 03/12] tests: add socat dependency for tests |
Date: |
Wed, 15 Feb 2023 19:25:21 +0000 |
We only use it for test-io-channel-command at the moment.
Unfortunately bringing socat into CI exposes an existing bug in the
test-io-channel-command unit test. For now disable the test with the
preprocessor until someone can diagnose it on Mac hardware.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/unit/test-io-channel-command.c | 4 ++--
.gitlab-ci.d/cirrus/freebsd-12.vars | 2 +-
.gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
.gitlab-ci.d/cirrus/macos-12.vars | 2 +-
tests/docker/dockerfiles/alpine.docker | 1 +
tests/docker/dockerfiles/centos8.docker | 1 +
tests/docker/dockerfiles/debian-amd64-cross.docker | 1 +
tests/docker/dockerfiles/debian-amd64.docker | 1 +
tests/docker/dockerfiles/debian-arm64-cross.docker | 1 +
tests/docker/dockerfiles/debian-armel-cross.docker | 1 +
tests/docker/dockerfiles/debian-armhf-cross.docker | 1 +
tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 +
tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 +
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 +
tests/docker/dockerfiles/debian-s390x-cross.docker | 1 +
tests/docker/dockerfiles/fedora-win32-cross.docker | 1 +
tests/docker/dockerfiles/fedora-win64-cross.docker | 1 +
tests/docker/dockerfiles/fedora.docker | 1 +
tests/docker/dockerfiles/opensuse-leap.docker | 1 +
tests/docker/dockerfiles/ubuntu2004.docker | 1 +
tests/lcitool/projects/qemu.yml | 1 +
21 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/tests/unit/test-io-channel-command.c
b/tests/unit/test-io-channel-command.c
index 425e2f5594..f3c34152ac 100644
--- a/tests/unit/test-io-channel-command.c
+++ b/tests/unit/test-io-channel-command.c
@@ -31,7 +31,7 @@
static char *socat = NULL;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(DARWIN)
static void test_io_channel_command_fifo(bool async)
{
g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX",
NULL);
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
socat = g_find_program_in_path("socat");
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(DARWIN)
g_test_add_func("/io/channel/command/fifo/sync",
test_io_channel_command_fifo_sync);
g_test_add_func("/io/channel/command/fifo/async",
diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars
b/.gitlab-ci.d/cirrus/freebsd-12.vars
index 8934e5d57f..44d8a2a511 100644
--- a/.gitlab-ci.d/cirrus/freebsd-12.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-12.vars
@@ -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'
diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars
b/.gitlab-ci.d/cirrus/freebsd-13.vars
index 65ce456c48..7622c849b2 100644
--- a/.gitlab-ci.d/cirrus/freebsd-13.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-13.vars
@@ -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'
diff --git a/.gitlab-ci.d/cirrus/macos-12.vars
b/.gitlab-ci.d/cirrus/macos-12.vars
index 65b78fa08f..da6aa6469b 100644
--- a/.gitlab-ci.d/cirrus/macos-12.vars
+++ b/.gitlab-ci.d/cirrus/macos-12.vars
@@ -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'
diff --git a/tests/docker/dockerfiles/alpine.docker
b/tests/docker/dockerfiles/alpine.docker
index 4a569d82f6..56cf14e553 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -94,6 +94,7 @@ RUN apk update && \
sed \
snappy-dev \
sndio-dev \
+ socat \
sparse \
spice-dev \
spice-protocol \
diff --git a/tests/docker/dockerfiles/centos8.docker
b/tests/docker/dockerfiles/centos8.docker
index fbc953c6dc..1291ae1b04 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -105,6 +105,7 @@ RUN dnf distro-sync -y && \
rpm \
sed \
snappy-devel \
+ socat \
spice-protocol \
spice-server-devel \
systemd-devel \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker
b/tests/docker/dockerfiles/debian-amd64-cross.docker
index 5175095a85..856db95100 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
tar \
tesseract-ocr \
diff --git a/tests/docker/dockerfiles/debian-amd64.docker
b/tests/docker/dockerfiles/debian-amd64.docker
index b61f664ea2..e3dba71ad5 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -120,6 +120,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
systemtap-sdt-dev \
tar \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker
b/tests/docker/dockerfiles/debian-arm64-cross.docker
index b69958c69f..b00e9e9bcf 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
tar \
tesseract-ocr \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker
b/tests/docker/dockerfiles/debian-armel-cross.docker
index 96b524fab6..fb1129f256 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
tar \
tesseract-ocr \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker
b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 08a75cebdb..7a2b864a38 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
tar \
tesseract-ocr \
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker
b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 5930e6fa5d..5a3340e964 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
tar \
tesseract-ocr \
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker
b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index c65d9830e7..422fdebe8f 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
tar \
tesseract-ocr \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 2ae56c978e..78d7ae6211 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
tar \
tesseract-ocr \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker
b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 0db86a0fcd..d06ea3605a 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
tar \
tesseract-ocr \
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker
b/tests/docker/dockerfiles/fedora-win32-cross.docker
index b659c0b8a8..21ed1c6081 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \
python3-sphinx_rtd_theme \
rpm \
sed \
+ socat \
sparse \
spice-protocol \
tar \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker
b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 0a404c15bf..95d30e7936 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \
python3-sphinx_rtd_theme \
rpm \
sed \
+ socat \
sparse \
spice-protocol \
tar \
diff --git a/tests/docker/dockerfiles/fedora.docker
b/tests/docker/dockerfiles/fedora.docker
index 5d60a96141..8e06d080b8 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -113,6 +113,7 @@ exec "$@"' > /usr/bin/nosync && \
rpm \
sed \
snappy-devel \
+ socat \
sparse \
spice-protocol \
spice-server-devel \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker
b/tests/docker/dockerfiles/opensuse-leap.docker
index 4b2c02d6ab..568c1c979f 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -104,6 +104,7 @@ RUN zypper update -y && \
sed \
snappy-devel \
sndio-devel \
+ socat \
sparse \
spice-protocol-devel \
systemd-devel \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker
b/tests/docker/dockerfiles/ubuntu2004.docker
index 13ab0b6887..f34d88d33d 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -119,6 +119,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-yaml \
rpm2cpio \
sed \
+ socat \
sparse \
systemtap-sdt-dev \
tar \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 6467bcf08a..2854748f49 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -101,6 +101,7 @@ packages:
- sed
- snappy
- sndio
+ - socat
- sparse
- spice-protocol
- spice-server
--
2.39.1
- [PATCH 04/12] tests: be a bit more strict cleaning up fifos, (continued)
- [PATCH 03/12] tests: add socat dependency for tests,
Alex Bennée <=
- [PATCH 10/12] tests/docker: Use binaries for debian-tricore-cross, Alex Bennée, 2023/02/15
- [PATCH 12/12] tests: ensure we export job results for some cross builds, Alex Bennée, 2023/02/15
- [PATCH 08/12] tests: skip the nios2 replay_kernel test, Alex Bennée, 2023/02/15
- Re: [PATCH 08/12] tests: skip the nios2 replay_kernel test, Richard Henderson, 2023/02/15