From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XBlVf-0001Qh-TO for qemu-devel@nongnu.org; Mon, 28 Jul 2014 10:02:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XBlVY-0004co-ED for qemu-devel@nongnu.org; Mon, 28 Jul 2014 10:02:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XBlVY-0004cT-64 for qemu-devel@nongnu.org; Mon, 28 Jul 2014 10:02:32 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6SE2V5s018783 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Jul 2014 10:02:31 -0400 From: Paolo Bonzini Date: Mon, 28 Jul 2014 16:02:14 +0200 Message-Id: <1406556135-31717-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1406556135-31717-1-git-send-email-pbonzini@redhat.com> References: <1406556135-31717-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/5] bios-tables-test: fix ASL normalization false positive List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, lersek@redhat.com, mst@redhat.com My version of IASL (from RHEL7) puts two newlines between the head comment and the DefinitionBlock property. One was already removed because the test uses sizeof instead of strlen, but the extra one breaks the detection of DefinitionBlock. Killing all newlines after the comment drops the warning. Signed-off-by: Paolo Bonzini --- tests/bios-tables-test.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 62771f7..045eb27 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -487,7 +487,11 @@ static GString *normalize_asl(gchar *asl_code) /* strip comments (different generation days) */ comment = g_strstr_len(asl->str, asl->len, COMMENT_END); if (comment) { - asl = g_string_erase(asl, 0, comment + sizeof(COMMENT_END) - asl->str); + comment += strlen(COMMENT_END); + while (*comment == '\n') { + comment++; + } + asl = g_string_erase(asl, 0, comment - asl->str); } /* strip def block name (it has file path in it) */ -- 1.8.3.1