From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5FTu-0006K9-Hj for qemu-devel@nongnu.org; Mon, 20 Jan 2014 09:05:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5FTo-0001SR-4O for qemu-devel@nongnu.org; Mon, 20 Jan 2014 09:05:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5FTn-0001SE-RK for qemu-devel@nongnu.org; Mon, 20 Jan 2014 09:05:32 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0KE5VY5022603 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 20 Jan 2014 09:05:31 -0500 Date: Mon, 20 Jan 2014 16:10:10 +0200 From: "Michael S. Tsirkin" Message-ID: <1390226872-781-16-git-send-email-mst@redhat.com> References: <1390226872-781-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1390226872-781-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 15/29] acpi unit-test: do not fail on asl mismatch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum From: Marcel Apfelbaum The asl comparison will break every time the ACPI tables are updated. This may break the git bisect. Instead of failing print a warning on stderr including the retained asl files, so they can be compared offline. Signed-off-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/acpi-test.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/acpi-test.c b/tests/acpi-test.c index 6095d07..31f5359 100644 --- a/tests/acpi-test.c +++ b/tests/acpi-test.c @@ -34,6 +34,7 @@ typedef struct { gchar *asl; /* asl code generated from aml */ gsize asl_len; gchar *asl_file; + bool asl_file_retain; /* do not delete the temp asl */ } QEMU_PACKED AcpiSdtTable; typedef struct { @@ -161,7 +162,7 @@ static void free_test_data(test_data *data) g_free(temp->asl); } if (temp->asl_file) { - if (g_strstr_len(temp->asl_file, -1, "asl-")) { + if (!temp->asl_file_retain) { unlink(temp->asl_file); } g_free(temp->asl_file); @@ -532,7 +533,15 @@ static void test_acpi_asl(test_data *data) load_asl(exp_data.tables, exp_sdt); exp_asl = normalize_asl(exp_sdt->asl); - g_assert(!g_strcmp0(asl->str, exp_asl->str)); + if (g_strcmp0(asl->str, exp_asl->str)) { + sdt->asl_file_retain = true; + exp_sdt->asl_file_retain = true; + fprintf(stderr, + "acpi-test: Warning! %.4s mismatch. " + "Orig asl: %s, expected asl %s.\n", + (gchar *)&exp_sdt->header.signature, + sdt->asl_file, exp_sdt->asl_file); + } g_string_free(asl, true); g_string_free(exp_asl, true); } -- MST