From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ0S3-0002Kz-9I for qemu-devel@nongnu.org; Thu, 27 Feb 2014 07:52:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJ0Rw-0007wD-RG for qemu-devel@nongnu.org; Thu, 27 Feb 2014 07:52:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ0Rw-0007w2-I7 for qemu-devel@nongnu.org; Thu, 27 Feb 2014 07:52:28 -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 s1RCqQvG011973 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 27 Feb 2014 07:52:27 -0500 From: Marcel Apfelbaum Date: Thu, 27 Feb 2014 14:52:41 +0200 Message-Id: <1393505561-1716-3-git-send-email-marcel.a@redhat.com> In-Reply-To: <1393505561-1716-1-git-send-email-marcel.a@redhat.com> References: <1393505561-1716-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH v3 2/2] acpi-test: issue errors instead of warnings when possible List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com If the expected (offline) acpi tables loaded correctly, it is safe to assume the iasl installation is OK and issue an error if the actual tables differ from expected ones. Signed-off-by: Marcel Apfelbaum --- v2->v3: Addressed Michael S. Tsirkin's comments: - got rid of a not needed if statement tests/acpi-test.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/tests/acpi-test.c b/tests/acpi-test.c index 2ce8c18..eb97786 100644 --- a/tests/acpi-test.c +++ b/tests/acpi-test.c @@ -411,7 +411,7 @@ static bool compare_signature(AcpiSdtTable *sdt, uint32_t signature) return sdt->header.signature == signature; } -static void load_asl(GArray *sdts, AcpiSdtTable *sdt) +static bool load_asl(GArray *sdts, AcpiSdtTable *sdt) { AcpiSdtTable *temp; GError *error = NULL; @@ -440,18 +440,22 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt) g_string_append_printf(command_line, "-d %s", sdt->aml_file); /* pass 'out' and 'out_err' in order to be redirected */ - g_spawn_command_line_sync(command_line->str, &out, &out_err, NULL, &error); + ret = g_spawn_command_line_sync(command_line->str, &out, &out_err, NULL, &error); g_assert_no_error(error); - ret = g_file_get_contents(sdt->asl_file, (gchar **)&sdt->asl, - &sdt->asl_len, &error); - g_assert(ret); - g_assert_no_error(error); - g_assert(sdt->asl_len); + if (ret) { + ret = g_file_get_contents(sdt->asl_file, (gchar **)&sdt->asl, + &sdt->asl_len, &error); + g_assert(ret); + g_assert_no_error(error); + g_assert(sdt->asl_len); + } g_free(out); g_free(out_err); g_string_free(command_line, true); + + return !ret; } #define COMMENT_END "*/" @@ -518,6 +522,7 @@ static void test_acpi_asl(test_data *data) int i; AcpiSdtTable *sdt, *exp_sdt; test_data exp_data; + gboolean err; memset(&exp_data, 0, sizeof(exp_data)); exp_data.tables = load_expected_aml(data); @@ -531,7 +536,7 @@ static void test_acpi_asl(test_data *data) load_asl(data->tables, sdt); asl = normalize_asl(sdt->asl); - load_asl(exp_data.tables, exp_sdt); + err = load_asl(exp_data.tables, exp_sdt); exp_asl = normalize_asl(exp_sdt->asl); if (g_strcmp0(asl->str, exp_asl->str)) { @@ -543,6 +548,7 @@ static void test_acpi_asl(test_data *data) (gchar *)&exp_sdt->header.signature, sdt->asl_file, sdt->aml_file, exp_sdt->asl_file, exp_sdt->aml_file); + g_assert(err); } g_string_free(asl, true); g_string_free(exp_asl, true); -- 1.8.3.1