[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/29] acpi unit-test: do not fail on asl mismatch
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 15/29] acpi unit-test: do not fail on asl mismatch |
Date: |
Mon, 20 Jan 2014 16:10:10 +0200 |
From: Marcel Apfelbaum <address@hidden>
The asl comparison will break every time the ACPI
tables are updated. This may break the git bisect.
Instead of failing print a warning on stderr
including the retained asl files, so they can be
compared offline.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
tests/acpi-test.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/acpi-test.c b/tests/acpi-test.c
index 6095d07..31f5359 100644
--- a/tests/acpi-test.c
+++ b/tests/acpi-test.c
@@ -34,6 +34,7 @@ typedef struct {
gchar *asl; /* asl code generated from aml */
gsize asl_len;
gchar *asl_file;
+ bool asl_file_retain; /* do not delete the temp asl */
} QEMU_PACKED AcpiSdtTable;
typedef struct {
@@ -161,7 +162,7 @@ static void free_test_data(test_data *data)
g_free(temp->asl);
}
if (temp->asl_file) {
- if (g_strstr_len(temp->asl_file, -1, "asl-")) {
+ if (!temp->asl_file_retain) {
unlink(temp->asl_file);
}
g_free(temp->asl_file);
@@ -532,7 +533,15 @@ static void test_acpi_asl(test_data *data)
load_asl(exp_data.tables, exp_sdt);
exp_asl = normalize_asl(exp_sdt->asl);
- g_assert(!g_strcmp0(asl->str, exp_asl->str));
+ if (g_strcmp0(asl->str, exp_asl->str)) {
+ sdt->asl_file_retain = true;
+ exp_sdt->asl_file_retain = true;
+ fprintf(stderr,
+ "acpi-test: Warning! %.4s mismatch. "
+ "Orig asl: %s, expected asl %s.\n",
+ (gchar *)&exp_sdt->header.signature,
+ sdt->asl_file, exp_sdt->asl_file);
+ }
g_string_free(asl, true);
g_string_free(exp_asl, true);
}
--
MST
- [Qemu-devel] [PULL 05/29] acpi unit-test: add test files, (continued)
- [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, 2014/01/20
- [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 <=
- [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
- [Qemu-devel] [PULL 25/29] pc: Q35 DSDT: exclude CPU hotplug IO range from PCI bus resources, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 26/29] pc: ACPI: expose PRST IO range via _CRS, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 27/29] pc: ACPI: unify source of CPU hotplug IO base/len, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 19/29] piix4: add acpi pci hotplug support, Michael S. Tsirkin, 2014/01/20