On 7/4/19 10:27 AM, Igor Mammedov wrote:
> tests do binary comparition so we can check tables without
> IASL. Move IASL condition right before decompilation step
> and skip it if IASL is not installed.
>
> Signed-off-by: Igor Mammedov <imamm...@redhat.com>
> ---
> tests/bios-tables-test.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 13bd166b81..a356ac3489 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -389,6 +389,14 @@ static void test_acpi_asl(test_data *data)
> all_tables_match = all_tables_match &&
> test_acpi_find_diff_allowed(exp_sdt);
>
> + /*
> + * don't try to decompile if IASL isn't present, in this case user
> + * will just 'get binary file mismatch' warnings and test failure
> + */
> + if (!iasl) {
> + continue;
> + }
> +
> err = load_asl(data->tables, sdt);
> asl = normalize_asl(sdt->asl);
>
> @@ -431,6 +439,11 @@ static void test_acpi_asl(test_data *data)
> g_string_free(asl, true);
> g_string_free(exp_asl, true);
> }
> + if (!iasl && !all_tables_match) {
> + fprintf(stderr, "to see ASL diff between mismatched files install
> IASL,"
> + " rebuild QEMU from scratch and re-run tests with V=1"
> + " environment variable set");
I guess remember Thomas asked to use g_printerr() instead of fprintf()
in tests/*.c.
Anyway,
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> + }
> g_assert(all_tables_match);
>
> free_test_data(&exp_data);
> @@ -599,7 +612,7 @@ static void test_acpi_one(const char *params, test_data
> *data)
>
> if (getenv(ACPI_REBUILD_EXPECTED_AML)) {
> dump_aml_files(data, true);
> - } else if (iasl) {
> + } else {
> test_acpi_asl(data);
> }
>
>
