acpi-test: issue errors instead of warnings when possible
v3 cover acpi-test: issue errors instead of warnings when possible
v2->v3:
Addressed Michael S. Tsirkin's comments:
- got rid of a not needed if statement
v1->v2:
Addressed Michael S. Tsirkin's comments:
- Split the path into 2 patches
- First patch retains both asl and aml files on failure.
- Second one "guesses" that iasl installation is OK by checking that no error was returned when the expected tables were parsed.
Marcel Apfelbaum (2):
acpi-test: retain both asl and aml files on failure
acpi-test: issue errors instead of warnings when possible
tests/acpi-test.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v3 1/2 acpi-test: retain both asl and aml files on failure
Updated the error message while at it.
--- tests/acpi-test.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
tests/acpi-test.c +9 -7
@@ -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);
Signature · 1 line
1.8.3.1
PATCH v3 2/2 acpi-test: issue errors instead of warnings when possible
In reply to Marcel ApfelbaumIf 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 differ from expected ones.
---v2->v3:
Addressed Michael S. Tsirkin's comments:
- got rid of a not needed if statement
tests/acpi-test.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
tests/acpi-test.c +14 -8
@@ -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 err;memset (&exp_data,0 ,sizeof (exp_data)); exp_data.tables =load_expected_aml (data);
@@ -531,7 +536,7 @@ static void test_acpi_asl(test_data *data)load_asl (data->tables, sdt); asl =normalize_asl (sdt->asl); -load_asl (exp_data.tables, exp_sdt); + err =load_asl (exp_data.tables, exp_sdt); exp_asl =normalize_asl (exp_sdt->asl);if (g_strcmp0 (asl->str, exp_asl->str)) {
@@ -543,6 +548,7 @@ static void test_acpi_asl(test_data *data) (gchar *)&exp_sdt->header.signature, sdt->asl_file, sdt->aml_file, exp_sdt->asl_file, exp_sdt->aml_file); +g_assert (err); }g_string_free (asl, true);g_string_free (exp_asl, true);
Signature · 1 line
1.8.3.1