All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Marcel Apfelbaum <marcel.a@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 2/2] acpi unit-test: hook to rebuild expected aml files
Date: Thu, 26 Dec 2013 12:56:33 +0200	[thread overview]
Message-ID: <20131226105633.GC22584@redhat.com> (raw)
In-Reply-To: <1388054651-13764-3-git-send-email-marcel.a@redhat.com>

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 <marcel.a@redhat.com>
> ---
>  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 <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 "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

  reply	other threads:[~2013-12-26 10:52 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-26 10:44 [Qemu-devel] [PATCH 0/2] acpi unit-test: rebuild aml files functionality Marcel Apfelbaum
2013-12-26 10:44 ` [Qemu-devel] [PATCH 1/2] acpi unit-test: added script to rebuild the expected aml files Marcel Apfelbaum
2013-12-26 10:53   ` Michael S. Tsirkin
2013-12-26 11:05     ` Marcel Apfelbaum
2013-12-26 10:44 ` [Qemu-devel] [PATCH 2/2] acpi unit-test: hook to rebuild " Marcel Apfelbaum
2013-12-26 10:56   ` Michael S. Tsirkin [this message]
2013-12-26 11:03     ` Marcel Apfelbaum

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131226105633.GC22584@redhat.com \
    --to=mst@redhat.com \
    --cc=marcel.a@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.