From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vw8YY-0005uo-Ao for qemu-devel@nongnu.org; Thu, 26 Dec 2013 05:52:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vw8YQ-0003tT-0R for qemu-devel@nongnu.org; Thu, 26 Dec 2013 05:52:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vw8YP-0003tA-Os for qemu-devel@nongnu.org; Thu, 26 Dec 2013 05:52:37 -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 rBQAqaJ4022319 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 26 Dec 2013 05:52:36 -0500 Date: Thu, 26 Dec 2013 12:56:33 +0200 From: "Michael S. Tsirkin" Message-ID: <20131226105633.GC22584@redhat.com> References: <1388054651-13764-1-git-send-email-marcel.a@redhat.com> <1388054651-13764-3-git-send-email-marcel.a@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1388054651-13764-3-git-send-email-marcel.a@redhat.com> Subject: Re: [Qemu-devel] [PATCH 2/2] acpi unit-test: hook to rebuild expected aml files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum Cc: qemu-devel@nongnu.org On Thu, Dec 26, 2013 at 12:44:11PM +0200, Marcel Apfelbaum wrote: > When running the test with ACPI_REBUILD_AML=y environment > variable, the test will rebuild and validate the expected aml > files. > > Signed-off-by: Marcel Apfelbaum > --- > tests/acpi-test.c | 30 +++++++++++++++++++++++++----- > 1 file changed, 25 insertions(+), 5 deletions(-) > > diff --git a/tests/acpi-test.c b/tests/acpi-test.c > index 954d9b9..2b8545d 100644 > --- a/tests/acpi-test.c > +++ b/tests/acpi-test.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include "qemu-common.h" > #include "libqtest.h" > #include "qemu/compiler.h" > @@ -21,6 +22,8 @@ > #define MACHINE_PC "pc" > #define MACHINE_Q35 "q35" > > +#define ACPI_REBUILD_EXPECTED_AML "ACPI_REBUILD_AML" > + Put TEST somewhere in the name please. Maybe as a prefix: TEST_ACPI_REBUILD_AML > /* DSDT and SSDTs format */ > typedef struct { > AcpiTableHeader header; > @@ -363,10 +366,11 @@ static void test_acpi_ssdt_tables(test_data *data) > } > } > > -static void dump_aml_files(test_data *data) > +static void dump_aml_files(test_data *data, bool rebuild) > { > AcpiSdtTable *sdt; > GError *error = NULL; > + gchar *aml_file = NULL; > gint fd; > int i; > > @@ -374,12 +378,24 @@ static void dump_aml_files(test_data *data) > sdt = &g_array_index(data->ssdt_tables, AcpiSdtTable, i); > g_assert(sdt->aml); > > - fd = g_file_open_tmp("aml-XXXXXX", &sdt->aml_file, &error); > - g_assert_no_error(error); > + if (rebuild) { > + aml_file = g_strdup_printf("%s/%s/%.4s", data_dir, data->machine, > + (gchar *)&sdt->header.signature); Hmm will this work if there are many SSDTs? They all have same signature, > + fd = g_open(aml_file, O_WRONLY|O_TRUNC|O_CREAT, > + S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH); > + } else { > + fd = g_file_open_tmp("aml-XXXXXX", &sdt->aml_file, &error); > + g_assert_no_error(error); > + } > + g_assert(fd >= 0); > > write(fd, sdt, sizeof(AcpiTableHeader)); > write(fd, sdt->aml, sdt->aml_len); > close(fd); > + > + if (aml_file) { > + g_free(aml_file); > + } > } > } > > @@ -487,7 +503,7 @@ static void test_acpi_asl(test_data *data) > > memset(&exp_data, 0, sizeof(exp_data)); > exp_data.ssdt_tables = load_expected_aml(data); > - dump_aml_files(data); > + dump_aml_files(data, false); > for (i = 0; i < data->ssdt_tables->len; ++i) { > GString *asl, *exp_asl; > > @@ -553,7 +569,11 @@ static void test_acpi_one(const char *params, test_data *data) > test_acpi_ssdt_tables(data); > > if (iasl) { > - test_acpi_asl(data); > + if (getenv(ACPI_REBUILD_EXPECTED_AML)) { > + dump_aml_files(data, true); > + } else { > + test_acpi_asl(data); > + } > } > > qtest_quit(global_qtest); > -- > 1.8.3.1