From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@amazon.com>,
Marcel Apfelbaum <marcel.a@redhat.com>
Subject: [Qemu-devel] [PULL v2 11/35] acpi unit-test: hook to rebuild expected aml files
Date: Sun, 26 Jan 2014 18:05:50 +0200 [thread overview]
Message-ID: <1390735289-15563-12-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1390735289-15563-1-git-send-email-mst@redhat.com>
From: Marcel Apfelbaum <marcel.a@redhat.com>
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 <marcel.a@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@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 83e5aed..89c4b81 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,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;
ssize_t ret;
int i;
@@ -375,8 +379,16 @@ 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);
+ 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);
ret = qemu_write_full(fd, sdt, sizeof(AcpiTableHeader));
g_assert(ret == sizeof(AcpiTableHeader));
@@ -384,6 +396,10 @@ static void dump_aml_files(test_data *data)
g_assert(ret == sdt->aml_len);
close(fd);
+
+ if (aml_file) {
+ g_free(aml_file);
+ }
}
}
@@ -491,7 +507,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;
@@ -557,7 +573,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);
--
MST
next prev parent reply other threads:[~2014-01-26 16:01 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-26 16:05 [Qemu-devel] [PULL v2 00/35] acpi, pci, pc, virtio fixes and enhancements Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 01/35] Python-lang gdb script to extract x86_64 guest vmcore from qemu coredump Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 02/35] Add DSDT node for AppleSMC Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 03/35] ACPI: Fix AppleSMC _STA size Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 04/35] virtio: Fix return value for dummy function vhost_net_virtqueue_pending Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 05/35] acpi unit-test: add test files Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 06/35] configure: added acpi unit-test files Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 07/35] acpi unit-test: compare DSDT and SSDT tables against expected values Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 08/35] configure: add CONFIG_IASL to config-host.h Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 09/35] acpi unit-test: extract iasl executable from configuration Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 10/35] acpi unit-test: added script to rebuild the expected aml files Michael S. Tsirkin
2014-01-26 16:05 ` Michael S. Tsirkin [this message]
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 12/35] tests: fix acpi to work on bigendian host Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 13/35] acpi unit-test: renamed ssdt_tables to tables Michael S. Tsirkin
2014-01-26 16:05 ` [Qemu-devel] [PULL v2 14/35] acpi unit-test: resolved iasl crash Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 15/35] acpi unit-test: do not fail on asl mismatch Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 16/35] pc: make: fix dependencies: rebuild when included file is changed Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 17/35] pci: add pci_for_each_bus_depth_first Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 18/35] pcihp: generalization of piix4 acpi Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 19/35] piix4: add acpi pci hotplug support Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 20/35] acpi-build: enable hotplug for PCI bridges Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 21/35] acpi: factor out common cpu hotplug code for PIIX4/Q35 Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 22/35] acpi: ich9: add CPU hotplug handling to Q35 machine Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 23/35] pc: set PRST base in DSDT depending on chipset Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 24/35] pc: PIIX DSDT: exclude CPU/PCI hotplug & GPE0 IO range from PCI bus resources Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 25/35] pc: Q35 DSDT: exclude CPU hotplug " Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 26/35] pc: ACPI: expose PRST IO range via _CRS Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 27/35] pc: ACPI: unify source of CPU hotplug IO base/len Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 28/35] pc: ACPI: update acpi-dsdt.hex.generated q35-acpi-dsdt.hex.generated Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 29/35] acpi-test: update expected AML since recent changes Michael S. Tsirkin
2014-01-26 16:06 ` [Qemu-devel] [PULL v2 30/35] hw/pci: fix error flow in pci multifunction init Michael S. Tsirkin
2014-01-26 16:07 ` [Qemu-devel] [PULL v2 31/35] pc: Save size of RAM below 4GB Michael S. Tsirkin
2014-01-26 16:07 ` [Qemu-devel] [PULL v2 32/35] acpi: Fix PCI hole handling on build_srat() Michael S. Tsirkin
2014-01-26 16:07 ` [Qemu-devel] [PULL v2 33/35] q35: gigabyte alignment for ram Michael S. Tsirkin
2014-01-26 16:07 ` [Qemu-devel] [PULL v2 34/35] q35: document gigabyte_align Michael S. Tsirkin
2014-01-26 16:07 ` [Qemu-devel] [PULL v2 35/35] MAINTAINERS: add self as virtio co-maintainer Michael S. Tsirkin
2014-01-28 11:21 ` [Qemu-devel] [PULL v2 00/35] acpi, pci, pc, virtio fixes and enhancements Michael S. Tsirkin
2014-01-29 16:38 ` Peter Maydell
2014-01-29 18:01 ` Michael S. Tsirkin
2014-01-31 11:12 ` Peter Maydell
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=1390735289-15563-12-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=aliguori@amazon.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).