From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43591)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1X4xJz-00067C-Vl
	for qemu-devel@nongnu.org; Wed, 09 Jul 2014 15:14:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1X4xJt-0008Ti-OR
	for qemu-devel@nongnu.org; Wed, 09 Jul 2014 15:14:27 -0400
Received: from cantor2.suse.de ([195.135.220.15]:59489 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1X4xJt-0008Te-HS
	for qemu-devel@nongnu.org; Wed, 09 Jul 2014 15:14:21 -0400
Message-ID: <53BD948B.3010407@suse.de>
Date: Wed, 09 Jul 2014 21:14:19 +0200
From: =?ISO-8859-1?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1404060115-27410-1-git-send-email-mst@redhat.com>
	<1404060115-27410-38-git-send-email-mst@redhat.com>
In-Reply-To: <1404060115-27410-38-git-send-email-mst@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PULL 37/37] tests: add human format test for
 string output visitor
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>, qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>, Hu Tao <hutao@cn.fujitsu.com>
Cc: Markus Armbruster <armbru@redhat.com>, Anthony Liguori <aliguori@amazon.com>, Luiz Capitulino <lcapitulino@redhat.com>

Am 29.06.2014 19:00, schrieb Michael S. Tsirkin:
> From: Hu Tao <hutao@cn.fujitsu.com>
>=20
> Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  tests/test-string-output-visitor.c | 109 +++++++++++++++++++++++++++++=
+-------
>  1 file changed, 90 insertions(+), 19 deletions(-)
>=20
> diff --git a/tests/test-string-output-visitor.c b/tests/test-string-out=
put-visitor.c
> index 28e7359..e89e43c 100644
> --- a/tests/test-string-output-visitor.c
> +++ b/tests/test-string-output-visitor.c
[...]
> @@ -162,12 +195,26 @@ static void test_visitor_out_enum(TestOutputVisit=
orData *data,
>      EnumOne i;
> =20
>      for (i =3D 0; i < ENUM_ONE_MAX; i++) {
> +        char *str_human;
> +        int len;
> +
>          visit_type_EnumOne(data->ov, &i, "unused", &err);
>          g_assert(!err);
> =20
> +        len =3D strlen(EnumOne_lookup[i]) + 2;
> +        str_human =3D g_malloc0(len);
> +        str_human[0] =3D '"';
> +        strncpy(str_human + 1, EnumOne_lookup[i], strlen(EnumOne_looku=
p[i]));
> +        str_human[len - 1] =3D '"';
> +
>          str =3D string_output_get_string(data->sov);
>          g_assert(str !=3D NULL);
> -        g_assert_cmpstr(str, =3D=3D, EnumOne_lookup[i]);
> +        if (data->human) {
> +            g_assert_cmpstr(str, =3D=3D, str_human);

This test is seriously busted: str_human is not NUL-terminated, breaking
-rc1's make check. Eric did ask to use g_strdup_printf() instead, which
would've prevented this bug, on the fixup series that appears to have
been squashed here.

Did anyone run make check at all? Peter?

Will cook up a patch.

Regards,
Andreas

> +        } else {
> +            g_assert_cmpstr(str, =3D=3D, EnumOne_lookup[i]);
> +        }
> +        g_free(str_human);
>  	g_free(str);
>      }
>  }
[snip]

--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe=
rg