[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/29] acpi unit-test: hook to rebuild expected aml f
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 11/29] acpi unit-test: hook to rebuild expected aml files |
Date: |
Mon, 20 Jan 2014 16:10:01 +0200 |
From: Marcel Apfelbaum <address@hidden>
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 <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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
- [Qemu-devel] [PULL 01/29] Python-lang gdb script to extract x86_64 guest vmcore from qemu coredump, (continued)
- [Qemu-devel] [PULL 01/29] Python-lang gdb script to extract x86_64 guest vmcore from qemu coredump, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 02/29] Add DSDT node for AppleSMC, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 04/29] virtio: Fix return value for dummy function vhost_net_virtqueue_pending, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 03/29] ACPI: Fix AppleSMC _STA size, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 05/29] acpi unit-test: add test files, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 06/29] configure: added acpi unit-test files, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 07/29] acpi unit-test: compare DSDT and SSDT tables against expected values, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 08/29] configure: add CONFIG_IASL to config-host.h, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 09/29] acpi unit-test: extract iasl executable from configuration, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 10/29] acpi unit-test: added script to rebuild the expected aml files, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 11/29] acpi unit-test: hook to rebuild expected aml files,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 12/29] tests: fix acpi to work on bigendian host, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 13/29] acpi unit-test: renamed ssdt_tables to tables, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 14/29] acpi unit-test: resolved iasl crash, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 15/29] acpi unit-test: do not fail on asl mismatch, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 16/29] pc: make: fix dependencies: rebuild when included file is changed, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 17/29] pci: add pci_for_each_bus_depth_first, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 18/29] pcihp: generalization of piix4 acpi, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 20/29] acpi-build: enable hotplug for PCI bridges, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 24/29] pc: PIIX DSDT: exclude CPU/PCI hotplug & GPE0 IO range from PCI bus resources, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 23/29] pc: set PRST base in DSDT depending on chipset, Michael S. Tsirkin, 2014/01/20