From nobody Wed Nov 5 16:42:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535139829344264.28292604061187; Fri, 24 Aug 2018 12:43:49 -0700 (PDT) Received: from localhost ([::1]:43238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ftHzo-0004pO-6F for importer@patchew.org; Fri, 24 Aug 2018 15:43:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ftHoi-0002Hm-DE for qemu-devel@nongnu.org; Fri, 24 Aug 2018 15:32:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ftHoe-0001fD-Dv for qemu-devel@nongnu.org; Fri, 24 Aug 2018 15:32:20 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41642 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ftHoc-0001Zi-4q for qemu-devel@nongnu.org; Fri, 24 Aug 2018 15:32:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4220A804B9F4 for ; Fri, 24 Aug 2018 19:32:10 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-97.ams2.redhat.com [10.36.116.97]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DAA8A9F0C for ; Fri, 24 Aug 2018 19:32:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2E9DF110E7CF; Fri, 24 Aug 2018 21:32:07 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 24 Aug 2018 21:31:38 +0200 Message-Id: <20180824193206.25475-31-armbru@redhat.com> In-Reply-To: <20180824193206.25475-1-armbru@redhat.com> References: <20180824193206.25475-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 24 Aug 2018 19:32:10 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 24 Aug 2018 19:32:10 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 30/58] check-qjson: Fix and enable utf8_string()'s disabled part X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20180823164025.12553-31-armbru@redhat.com> --- tests/check-qjson.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 343f8af36a..defc21fa04 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -776,15 +776,10 @@ static void utf8_string(void) qobject_unref(str); g_free(jstr); =20 - /* - * Parse @json_out right back - * Disabled, because qobject_from_json() is buggy, and I can't - * be bothered to add the expected incorrect results. - * FIXME Enable once these bugs have been fixed. - */ - if (0 && json_out !=3D json_in) { + /* Parse @json_out right back, unless it has replacements */ + if (!strstr(json_out, "\\uFFFD")) { str =3D from_json_str(json_out, j, &error_abort); - g_assert_cmpstr(qstring_get_try_str(str), =3D=3D, utf8_out= ); + g_assert_cmpstr(qstring_get_try_str(str), =3D=3D, utf8_in); } } } --=20 2.17.1