Re: [PATCH] tests/unit: simpler variable sequence for test-io-channel

From: Laurent Vivier <laurent@vivier.eu>
To: "Alex Bennée" <alex.bennee@linaro.org>
Cc: qemu-devel@nongnu.org, "Daniel P. Berrangé" <berrange@redhat.com>,
	"qemu-trivial@nongnu.org" <qemu-trivial@nongnu.org>
Subject: Re: [PATCH] tests/unit: simpler variable sequence for test-io-channel
Date: Thu, 3 Nov 2022 17:03:25 +0100	[thread overview]
Message-ID: <98b8b2e3-636d-a550-1eb2-e2e2d3d24959@vivier.eu> (raw)
In-Reply-To: <87wn8cjmqh.fsf@linaro.org>

Le 03/11/2022 à 12:32, Alex Bennée a écrit :
> 
> Laurent Vivier <laurent@vivier.eu> writes:
> 
>> Le 03/11/2022 à 11:23, Alex Bennée a écrit :
>>> This avoids some compilers complaining about a potentially
>>> un-initialised [src|dst]argv. In retrospect using GString was overkill
>>> for what we are constructing.
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> ---
>>>    tests/unit/test-io-channel-command.c | 14 ++++----------
>>>    1 file changed, 4 insertions(+), 10 deletions(-)
>>> diff --git a/tests/unit/test-io-channel-command.c
>>> b/tests/unit/test-io-channel-command.c
>>> index 43e29c8cfb..19f72eab96 100644
>>> --- a/tests/unit/test-io-channel-command.c
>>> +++ b/tests/unit/test-io-channel-command.c
>>> @@ -33,19 +33,13 @@ static void test_io_channel_command_fifo(bool async)
>>>    {
>>>        g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL);
>>>        g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO);
>>> -    g_autoptr(GString) srcargs = g_string_new(socat);
>>> -    g_autoptr(GString) dstargs = g_string_new(socat);
>>> -    g_auto(GStrv) srcargv;
>>> -    g_auto(GStrv) dstargv;
>>> +    g_autofree gchar *srcargs = g_strdup_printf("%s - PIPE:%s,wronly", socat, fifo);
>>> +    g_autofree gchar *dstargs = g_strdup_printf("%s PIPE:%s,rdonly -", socat, fifo);
>>> +    g_auto(GStrv) srcargv = g_strsplit(srcargs, " ", -1);
>>> +    g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1);
>>>        QIOChannel *src, *dst;
>>>        QIOChannelTest *test;
>>>    -    g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo);
>>> -    g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo);
>>> -
>>> -    srcargv = g_strsplit(srcargs->str, " ", -1);
>>> -    dstargv = g_strsplit(dstargs->str, " ", -1);
>>> -
>>>        src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv,
>>>                                                        O_WRONLY,
>>>                                                        &error_abort));
>>
>> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
>>
>> Do you want this be merged via trivial branch?
> 
> I'm easy either way. I've got a for-7.2/misc-fixes branch which I'll
> send once I can figure out whats going on with the avocado console
> interaction code.

Applied to my trivial-patches branch.

Thanks,
Laurent