[v16,63/99] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM

Commit Message

Alex Bennée June 4, 2021, 3:52 p.m. UTC

From: Claudio Fontana <[e-mail]>

test is TCG-only.

Signed-off-by: Claudio Fontana <[e-mail]>
Cc: Philippe Mathieu-Daudé <[e-mail]>
Signed-off-by: Alex Bennée <[e-mail]>
---
 tests/qtest/bios-tables-test.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Richard Henderson June 5, 2021, 4:24 p.m. UTC | #1

On 6/4/21 8:52 AM, Alex Bennée wrote:
> From: Claudio Fontana<[e-mail]>
> 
> test is TCG-only.
> 
> Signed-off-by: Claudio Fontana<[e-mail]>
> Cc: Philippe Mathieu-Daudé<[e-mail]>
> Signed-off-by: Alex Bennée<[e-mail]>
> ---
>   tests/qtest/bios-tables-test.c | 7 +++++++
>   1 file changed, 7 insertions(+)

The new qtest_has_accel should be used instead of an ifdef.


r~

Alex Bennée June 18, 2021, 3:25 p.m. UTC | #2

Richard Henderson <[e-mail]> writes:

> On 6/4/21 8:52 AM, Alex Bennée wrote:
>> From: Claudio Fontana<[e-mail]>
>> test is TCG-only.
>> Signed-off-by: Claudio Fontana<[e-mail]>
>> Cc: Philippe Mathieu-Daudé<[e-mail]>
>> Signed-off-by: Alex Bennée<[e-mail]>
>> ---
>>   tests/qtest/bios-tables-test.c | 7 +++++++
>>   1 file changed, 7 insertions(+)
>
> The new qtest_has_accel should be used instead of an ifdef.

I think I can drop the whole patch as nothing is added unless:

    } else if (strcmp(arch, "aarch64") == 0 && tcg_accel_available) {

further down.

>
>
> r~

Patch

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 762d154b34..f8fe4b8efe 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1484,6 +1484,13 @@  static void test_acpi_oem_fields_virt_tcg(void)
     };
     char *args;
 
+#ifndef CONFIG_TCG
+    if (data.tcg_only) {
+        g_test_skip("TCG disabled, skipping ACPI tcg_only test");
+        return;
+    }
+#endif /* CONFIG_TCG */
+
     args = test_acpi_create_args(&data,
                                  "-cpu cortex-a57 "OEM_TEST_ARGS, true);
     data.qts = qtest_init(args);