diff options
author | Igor Mammedov | 2019-07-08 11:24:10 +0200 |
---|---|---|
committer | Michael S. Tsirkin | 2019-07-12 16:56:26 +0200 |
commit | 7b9829bc6c7d84056c3a1c60737f71db4d2871e4 (patch) | |
tree | 23daa62babf29df4de33cb51fe865be865b3c5da /tests/bios-tables-test.c | |
parent | tests: acpi: do not require IASL for dumping AML blobs (diff) | |
download | qemu-7b9829bc6c7d84056c3a1c60737f71db4d2871e4.tar.gz qemu-7b9829bc6c7d84056c3a1c60737f71db4d2871e4.tar.xz qemu-7b9829bc6c7d84056c3a1c60737f71db4d2871e4.zip |
tests: acpi: do not skip tests when IASL is not installed
tests do binary comparision 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 <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190708092410.11167-3-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'tests/bios-tables-test.c')
-rw-r--r-- | tests/bios-tables-test.c | 15 |
1 files changed, 14 insertions, 1 deletions
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"); + } 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); } |