From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Anthony Liguori <aliguori@amazon.com>,
Marcel Apfelbaum <marcel.a@redhat.com>
Subject: [Qemu-devel] [PULL 11/12] acpi-test: retain both asl and aml files on failure
Date: Tue, 4 Mar 2014 15:03:30 +0200 [thread overview]
Message-ID: <1393937889-14553-12-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1393937889-14553-1-git-send-email-mst@redhat.com>
From: Marcel Apfelbaum <marcel.a@redhat.com>
Updated the error message while at it.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
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
next prev parent reply other threads:[~2014-03-04 13:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 13:03 [Qemu-devel] [PULL 00/12] acpi,pc,pci,virtio,memory bug fixes Michael S. Tsirkin
2014-03-04 13:03 ` [Qemu-devel] [PULL 01/12] acpi-build: append description for non-hotplug Michael S. Tsirkin
2014-03-04 13:03 ` [Qemu-devel] [PULL 02/12] acpi-test-data: update expected files Michael S. Tsirkin
2014-03-04 13:03 ` [Qemu-devel] [PULL 03/12] virtio-net: remove function calls from assert Michael S. Tsirkin
2014-03-04 13:03 ` [Qemu-devel] [PULL 04/12] memory_region_present: return false if address is not found in child MemoryRegion Michael S. Tsirkin
2014-03-04 13:03 ` [Qemu-devel] [PULL 05/12] PCIE: fix regression with coldplugged multifunction device Michael S. Tsirkin
2014-03-04 13:03 ` [Qemu-devel] [PULL 06/12] Rework --name to use QemuOpts Michael S. Tsirkin
2014-03-04 13:03 ` [Qemu-devel] [PULL 07/12] Add 'debug-threads' suboption to --name Michael S. Tsirkin
2014-03-04 13:03 ` [Qemu-devel] [PULL 08/12] Add a 'name' parameter to qemu_thread_create Michael S. Tsirkin
2014-03-04 13:03 ` [Qemu-devel] [PULL 09/12] MAINTAINERS: drop an out of date address Michael S. Tsirkin
2014-03-04 16:05 ` Andreas Färber
2014-03-04 16:13 ` Paolo Bonzini
2014-03-04 13:03 ` [Qemu-devel] [PULL 10/12] acpi-build: partially revert dac1e93093f9306c114f410785c99aa5261539b4 Michael S. Tsirkin
2014-03-04 13:03 ` Michael S. Tsirkin [this message]
2014-03-04 13:03 ` [Qemu-devel] [PULL 12/12] acpi-test: issue errors instead of warnings when possible Michael S. Tsirkin
2014-03-04 13:07 ` [Qemu-devel] [PULL 00/12] acpi,pc,pci,virtio,memory bug fixes Peter Maydell
2014-03-04 13:11 ` Michael S. Tsirkin
2014-03-06 21:43 ` Michael S. Tsirkin
2014-03-06 21:56 ` 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=1393937889-14553-12-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=aliguori@amazon.com \
--cc=marcel.a@redhat.com \
--cc=peter.maydell@linaro.org \
--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).