Re: [PATCH 03/12] tests: add socat dependency for tests

[Philippe Mathieu-Daudé]

On 15/2/23 20:25, Alex Bennée wrote:
> 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)

s/DARWIN/CONFIG_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)

CONFIG_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",

^ Clearly another preliminary patch.

With the split, for both patches, using CONFIG_DARWIN:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>