[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 10/14] acpi-test: retain both asl and aml files on
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v3 10/14] acpi-test: retain both asl and aml files on failure |
Date: |
Sun, 9 Mar 2014 21:20:27 +0200 |
From: Marcel Apfelbaum <address@hidden>
Updated the error message while at it.
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 | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/tests/acpi-test.c b/tests/acpi-test.c
index 31f5359..2ce8c18 100644
--- a/tests/acpi-test.c
+++ b/tests/acpi-test.c
@@ -34,7 +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 */
+ bool tmp_files_retain; /* do not delete the temp asl/aml */
} QEMU_PACKED AcpiSdtTable;
typedef struct {
@@ -153,7 +153,8 @@ static void free_test_data(test_data *data)
g_free(temp->aml);
}
if (temp->aml_file) {
- if (g_strstr_len(temp->aml_file, -1, "aml-")) {
+ if (!temp->tmp_files_retain &&
+ g_strstr_len(temp->aml_file, -1, "aml-")) {
unlink(temp->aml_file);
}
g_free(temp->aml_file);
@@ -162,7 +163,7 @@ static void free_test_data(test_data *data)
g_free(temp->asl);
}
if (temp->asl_file) {
- if (!temp->asl_file_retain) {
+ if (!temp->tmp_files_retain) {
unlink(temp->asl_file);
}
g_free(temp->asl_file);
@@ -534,13 +535,14 @@ static void test_acpi_asl(test_data *data)
exp_asl = normalize_asl(exp_sdt->asl);
if (g_strcmp0(asl->str, exp_asl->str)) {
- sdt->asl_file_retain = true;
- exp_sdt->asl_file_retain = true;
+ sdt->tmp_files_retain = true;
+ exp_sdt->tmp_files_retain = true;
fprintf(stderr,
"acpi-test: Warning! %.4s mismatch. "
- "Orig asl: %s, expected asl %s.\n",
+ "Actual [asl:%s, aml:%s], Expected [asl:%s, aml:%s].\n",
(gchar *)&exp_sdt->header.signature,
- sdt->asl_file, exp_sdt->asl_file);
+ sdt->asl_file, sdt->aml_file,
+ exp_sdt->asl_file, exp_sdt->aml_file);
}
g_string_free(asl, true);
g_string_free(exp_asl, true);
--
MST
- [Qemu-devel] [PULL v3 00/14] acpi,pc,pci,virtio,memory bug fixes, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 01/14] acpi-build: append description for non-hotplug, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 02/14] acpi-test-data: update expected files, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 03/14] virtio-net: remove function calls from assert, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 04/14] memory_region_present: return false if address is not found in child MemoryRegion, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 06/14] Rework --name to use QemuOpts, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 05/14] PCIE: fix regression with coldplugged multifunction device, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 08/14] Add a 'name' parameter to qemu_thread_create, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 09/14] MAINTAINERS: drop an out of date address, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 10/14] acpi-test: retain both asl and aml files on failure,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v3 11/14] acpi-test: issue errors instead of warnings when possible, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 12/14] pam: partly fix write-only mode, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 13/14] pckbd: return 'keyboard enabled' on read input port command, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 14/14] qemu: x86: ignore ioapic polarity, Michael S. Tsirkin, 2014/03/09
- [Qemu-devel] [PULL v3 07/14] Add 'debug-threads' suboption to --name, Michael S. Tsirkin, 2014/03/09
- Re: [Qemu-devel] [PULL v3 00/14] acpi, pc, pci, virtio, memory bug fixes, Peter Maydell, 2014/03/10
- Re: [Qemu-devel] [PULL v3 00/14] acpi, pc, pci, virtio, memory bug fixes, Michael S. Tsirkin, 2014/03/10
- Re: [Qemu-devel] [PULL v3 00/14] acpi, pc, pci, virtio, memory bug fixes, Peter Maydell, 2014/03/11
- Re: [Qemu-devel] [PULL v3 00/14] acpi, pc, pci, virtio, memory bug fixes, Michael S. Tsirkin, 2014/03/11
- Re: [Qemu-devel] [PULL v3 00/14] acpi, pc, pci, virtio, memory bug fixes, Peter Maydell, 2014/03/11