From: Igor Mammedov <imammedo@redhat.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH v3 2/2] tests: acpi: do not skip tests when IASL is not installed Date: Mon, 8 Jul 2019 05:24:10 -0400 [thread overview] Message-ID: <20190708092410.11167-3-imammedo@redhat.com> (raw) In-Reply-To: <20190708092410.11167-1-imammedo@redhat.com> 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> --- v2: - fix typo in commit message Eric Auger <eric.auger@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"); + } 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); } -- 2.18.1
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Cc: "Laurent Vivier" <lvivier@redhat.com>, "Peter Maydell" <peter.maydell@linaro.org>, "Thomas Huth" <thuth@redhat.com>, "Eric Auger" <eric.auger@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Igor Mammedov" <imammedo@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [Qemu-devel] [PULL 5/8] tests: acpi: do not skip tests when IASL is not installed Date: Fri, 12 Jul 2019 11:36:29 -0400 [thread overview] Message-ID: <20190708092410.11167-3-imammedo@redhat.com> (raw) Message-ID: <20190712153629.9RtyUQ11Obw8z_BAya0RVVwESW9OB0AAv-cNBCL79Hg@z> (raw) In-Reply-To: <20190712153504.14937-1-mst@redhat.com> From: Igor Mammedov <imammedo@redhat.com> 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> --- 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"); + } 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); } -- MST
next prev parent reply other threads:[~2019-07-08 9:26 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-08 9:24 [Qemu-devel] [PATCH v3 0/2] tests: acpi: improve tests reproducability Igor Mammedov 2019-07-08 9:24 ` [Qemu-devel] [PATCH v3 1/2] tests: acpi: do not require IASL for dumping AML blobs Igor Mammedov 2019-07-12 15:36 ` [Qemu-devel] [PULL 4/8] " Michael S. Tsirkin 2019-07-08 9:24 ` Igor Mammedov [this message] 2019-07-12 15:36 ` [Qemu-devel] [PULL 5/8] tests: acpi: do not skip tests when IASL is not installed Michael S. Tsirkin -- strict thread matches above, loose matches on Subject: below -- 2019-07-12 7:35 [Qemu-devel] [PATCH 0/3] virtio pmem: coverity fixes Pankaj Gupta 2019-07-12 7:35 ` [Qemu-devel] [PATCH 1/3] virtio pmem: fix wrong mem region condition Pankaj Gupta 2019-07-12 8:50 ` Stefano Garzarella 2019-07-12 9:56 ` Cornelia Huck 2019-07-12 15:36 ` [Qemu-devel] [PULL 6/8] " Michael S. Tsirkin 2019-07-12 17:05 ` [Qemu-devel] [PATCH 1/3] " Philippe Mathieu-Daudé 2019-07-15 6:44 ` David Hildenbrand 2019-07-12 7:35 ` [Qemu-devel] [PATCH 2/3] virtio pmem: remove memdev null check Pankaj Gupta 2019-07-12 10:01 ` Cornelia Huck 2019-07-12 15:36 ` [Qemu-devel] [PULL 7/8] " Michael S. Tsirkin 2019-07-12 7:35 ` [Qemu-devel] [PATCH 3/3] virtio pmem: remove transational device info Pankaj Gupta 2019-07-12 10:03 ` Cornelia Huck 2019-07-12 10:06 ` Pankaj Gupta 2019-07-12 15:36 ` [Qemu-devel] [PULL 8/8] virtio pmem: remove transitional names Michael S. Tsirkin 2019-07-15 6:44 ` [Qemu-devel] [PATCH 3/3] virtio pmem: remove transational device info David Hildenbrand 2019-07-15 7:22 ` Pankaj Gupta 2019-07-15 7:25 ` David Hildenbrand 2019-07-12 10:03 ` [Qemu-devel] [PATCH 0/3] virtio pmem: coverity fixes Cornelia Huck 2019-07-12 10:05 ` Pankaj Gupta 2019-07-12 15:36 [Qemu-devel] [PULL 0/8] virtio, pc, pci: fixes, cleanups, tests Michael S. Tsirkin 2019-07-10 14:14 ` [Qemu-devel] [PATCH] virtio-balloon: fix QEMU 4.0 config size migration incompatibility Stefan Hajnoczi 2019-07-10 15:24 ` Dr. David Alan Gilbert 2019-07-11 7:18 ` Wolfgang Bumiller 2019-07-11 8:30 ` Dr. David Alan Gilbert 2019-07-12 15:36 ` [Qemu-devel] [PULL 3/8] " Michael S. Tsirkin 2019-07-12 15:36 ` [Qemu-devel] [PULL 1/8] xio3130_downstream: typo fix Michael S. Tsirkin 2019-07-12 15:36 ` [Qemu-devel] [PULL 2/8] pcie: consistent names for function args Michael S. Tsirkin 2019-07-15 8:45 ` [Qemu-devel] [PULL 0/8] virtio, pc, pci: fixes, cleanups, tests 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=20190708092410.11167-3-imammedo@redhat.com \ --to=imammedo@redhat.com \ --cc=mst@redhat.com \ --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: linkBe 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).