On Thu, 2013-12-26 at 16:24 +0200, Michael S. Tsirkin wrote:
> On Thu, Dec 26, 2013 at 04:07:59PM +0200, Marcel Apfelbaum wrote:
> > When running the test with TEST_ACPI_REBUILD_AML=y environment
> > variable, the test will rebuild and validate the expected aml
> > files.
> >
> > Signed-off-by: Marcel Apfelbaum <marce...@redhat.com>
> > ---
> > v2 -> v3:
> > Addressed Michael S. Tsirkin's comments:
> > - Used qemu_write_full instead of write
> > v1 -> v2:
> > Addressed Michael S. Tsirkin's comments:
> > - added TEST_ prefix to the environment variable
> >
> > tests/acpi-test.c | 37 ++++++++++++++++++++++++++++++-------
> > 1 file changed, 30 insertions(+), 7 deletions(-)
> >
> > diff --git a/tests/acpi-test.c b/tests/acpi-test.c
> > index 954d9b9..5aa0a00 100644
> > --- a/tests/acpi-test.c
> > +++ b/tests/acpi-test.c
> > @@ -13,6 +13,7 @@
> > #include <string.h>
> > #include <stdio.h>
> > #include <glib.h>
> > +#include <glib/gstdio.h>
> > #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 "TEST_ACPI_REBUILD_AML"
> > +
> > /* DSDT and SSDTs format */
> > typedef struct {
> > AcpiTableHeader header;
> > @@ -363,23 +366,39 @@ 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;
> > + ssize_t ret;
> >
> > for (i = 0; i < data->ssdt_tables->len; ++i) {
> > 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);
> > + 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);
>
> Please fix the original patch up and resend the whole series -
> it's not a good idea to break bisect.
I finally understood, the prev series :)
I am sending both of them shortly.
Thanks,
Marcel
>
> So just smash this patch into the previous one.
>
> > + ret = qemu_write_full(fd, sdt, sizeof(AcpiTableHeader));
> > + g_assert(ret == sizeof(AcpiTableHeader));
> > + ret = qemu_write_full(fd, sdt->aml, sdt->aml_len);
> > + g_assert(ret == sdt->aml_len);
> > close(fd);
> > +
> > + if (aml_file) {
> > + g_free(aml_file);
> > + }
> > }
> > }
> >
> > @@ -487,7 +506,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 +572,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
