* [Qemu-devel] [PATCH v4 0/3] acpi-test: issue errors instead of warnings when possible
@ 2014-02-27 14:17 Marcel Apfelbaum
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 1/3] acpi-build: partially revert dac1e93093f9306c114f410785c99aa5261539b4 Marcel Apfelbaum
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Marcel Apfelbaum @ 2014-02-27 14:17 UTC (permalink / raw)
To: qemu-devel; +Cc: mst
v3->v4:
- Do not issue error on tables sync issues to not break git bisect
- Rebased on mst's pci branch. Partially reverted a patch
v2->v3:
Addressed Michael S. Tsirkin's comments:
- got rid of a not needed if statement
Marcel Apfelbaum (3):
acpi-build: Partially revert dac1e93093f9306c114f410785c99aa5261539b4
acpi-test: retain both asl and aml files on failure
acpi-test: issue errors instead of warnings when possible
tests/acpi-test.c | 42 ++++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 16 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH v4 1/3] acpi-build: partially revert dac1e93093f9306c114f410785c99aa5261539b4
2014-02-27 14:17 [Qemu-devel] [PATCH v4 0/3] acpi-test: issue errors instead of warnings when possible Marcel Apfelbaum
@ 2014-02-27 14:17 ` Marcel Apfelbaum
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 2/3] acpi-test: retain both asl and aml files on failure Marcel Apfelbaum
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Marcel Apfelbaum @ 2014-02-27 14:17 UTC (permalink / raw)
To: qemu-devel; +Cc: mst
It touched the acpi test by mistake, removed that hunk.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
---
tests/acpi-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/acpi-test.c b/tests/acpi-test.c
index 613dda8..31f5359 100644
--- a/tests/acpi-test.c
+++ b/tests/acpi-test.c
@@ -153,7 +153,7 @@ static void free_test_data(test_data *data)
g_free(temp->aml);
}
if (temp->aml_file) {
- if (!temp->asl_file_retain && g_strstr_len(temp->aml_file, -1, "aml-")) {
+ if (g_strstr_len(temp->aml_file, -1, "aml-")) {
unlink(temp->aml_file);
}
g_free(temp->aml_file);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH v4 2/3] acpi-test: retain both asl and aml files on failure
2014-02-27 14:17 [Qemu-devel] [PATCH v4 0/3] acpi-test: issue errors instead of warnings when possible Marcel Apfelbaum
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 1/3] acpi-build: partially revert dac1e93093f9306c114f410785c99aa5261539b4 Marcel Apfelbaum
@ 2014-02-27 14:17 ` Marcel Apfelbaum
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 3/3] acpi-test: issue errors instead of warnings when possible Marcel Apfelbaum
2014-02-27 15:06 ` [Qemu-devel] [PATCH v4 0/3] " Michael S. Tsirkin
3 siblings, 0 replies; 5+ messages in thread
From: Marcel Apfelbaum @ 2014-02-27 14:17 UTC (permalink / raw)
To: qemu-devel; +Cc: mst
Updated the error message while at it.
Signed-off-by: Marcel Apfelbaum <marcel.a@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);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH v4 3/3] acpi-test: issue errors instead of warnings when possible
2014-02-27 14:17 [Qemu-devel] [PATCH v4 0/3] acpi-test: issue errors instead of warnings when possible Marcel Apfelbaum
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 1/3] acpi-build: partially revert dac1e93093f9306c114f410785c99aa5261539b4 Marcel Apfelbaum
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 2/3] acpi-test: retain both asl and aml files on failure Marcel Apfelbaum
@ 2014-02-27 14:17 ` Marcel Apfelbaum
2014-02-27 15:06 ` [Qemu-devel] [PATCH v4 0/3] " Michael S. Tsirkin
3 siblings, 0 replies; 5+ messages in thread
From: Marcel Apfelbaum @ 2014-02-27 14:17 UTC (permalink / raw)
To: qemu-devel; +Cc: mst
If the expected (offline) acpi tables loaded correctly,
it is safe to assume the iasl installation is OK and
issue an error if the actual tables failed to load.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
---
v3->v4:
- Do not issue error on tables sync issues to not break git bisect
v2->v3:
Addressed Michael S. Tsirkin's comments:
- got rid of a not needed if statement
tests/acpi-test.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/tests/acpi-test.c b/tests/acpi-test.c
index 2ce8c18..185309a 100644
--- a/tests/acpi-test.c
+++ b/tests/acpi-test.c
@@ -411,7 +411,7 @@ static bool compare_signature(AcpiSdtTable *sdt, uint32_t signature)
return sdt->header.signature == signature;
}
-static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
+static bool load_asl(GArray *sdts, AcpiSdtTable *sdt)
{
AcpiSdtTable *temp;
GError *error = NULL;
@@ -440,18 +440,22 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
g_string_append_printf(command_line, "-d %s", sdt->aml_file);
/* pass 'out' and 'out_err' in order to be redirected */
- g_spawn_command_line_sync(command_line->str, &out, &out_err, NULL, &error);
+ ret = g_spawn_command_line_sync(command_line->str, &out, &out_err, NULL, &error);
g_assert_no_error(error);
- ret = g_file_get_contents(sdt->asl_file, (gchar **)&sdt->asl,
- &sdt->asl_len, &error);
- g_assert(ret);
- g_assert_no_error(error);
- g_assert(sdt->asl_len);
+ if (ret) {
+ ret = g_file_get_contents(sdt->asl_file, (gchar **)&sdt->asl,
+ &sdt->asl_len, &error);
+ g_assert(ret);
+ g_assert_no_error(error);
+ g_assert(sdt->asl_len);
+ }
g_free(out);
g_free(out_err);
g_string_free(command_line, true);
+
+ return !ret;
}
#define COMMENT_END "*/"
@@ -518,6 +522,7 @@ static void test_acpi_asl(test_data *data)
int i;
AcpiSdtTable *sdt, *exp_sdt;
test_data exp_data;
+ gboolean exp_err, err;
memset(&exp_data, 0, sizeof(exp_data));
exp_data.tables = load_expected_aml(data);
@@ -528,12 +533,15 @@ static void test_acpi_asl(test_data *data)
sdt = &g_array_index(data->tables, AcpiSdtTable, i);
exp_sdt = &g_array_index(exp_data.tables, AcpiSdtTable, i);
- load_asl(data->tables, sdt);
+ err = load_asl(data->tables, sdt);
asl = normalize_asl(sdt->asl);
- load_asl(exp_data.tables, exp_sdt);
+ exp_err = load_asl(exp_data.tables, exp_sdt);
exp_asl = normalize_asl(exp_sdt->asl);
+ /* TODO: check for warnings */
+ g_assert(!err || exp_err);
+
if (g_strcmp0(asl->str, exp_asl->str)) {
sdt->tmp_files_retain = true;
exp_sdt->tmp_files_retain = true;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v4 0/3] acpi-test: issue errors instead of warnings when possible
2014-02-27 14:17 [Qemu-devel] [PATCH v4 0/3] acpi-test: issue errors instead of warnings when possible Marcel Apfelbaum
` (2 preceding siblings ...)
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 3/3] acpi-test: issue errors instead of warnings when possible Marcel Apfelbaum
@ 2014-02-27 15:06 ` Michael S. Tsirkin
3 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2014-02-27 15:06 UTC (permalink / raw)
To: Marcel Apfelbaum; +Cc: qemu-devel
On Thu, Feb 27, 2014 at 04:17:29PM +0200, Marcel Apfelbaum wrote:
> v3->v4:
> - Do not issue error on tables sync issues to not break git bisect
> - Rebased on mst's pci branch. Partially reverted a patch
>
> v2->v3:
> Addressed Michael S. Tsirkin's comments:
> - got rid of a not needed if statement
>
> Marcel Apfelbaum (3):
> acpi-build: Partially revert dac1e93093f9306c114f410785c99aa5261539b4
> acpi-test: retain both asl and aml files on failure
> acpi-test: issue errors instead of warnings when possible
>
> tests/acpi-test.c | 42 ++++++++++++++++++++++++++----------------
> 1 file changed, 26 insertions(+), 16 deletions(-)
Looks good.
Applied, thanks!
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-02-27 15:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-27 14:17 [Qemu-devel] [PATCH v4 0/3] acpi-test: issue errors instead of warnings when possible Marcel Apfelbaum
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 1/3] acpi-build: partially revert dac1e93093f9306c114f410785c99aa5261539b4 Marcel Apfelbaum
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 2/3] acpi-test: retain both asl and aml files on failure Marcel Apfelbaum
2014-02-27 14:17 ` [Qemu-devel] [PATCH v4 3/3] acpi-test: issue errors instead of warnings when possible Marcel Apfelbaum
2014-02-27 15:06 ` [Qemu-devel] [PATCH v4 0/3] " Michael S. Tsirkin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.