diff mbox series

[RFC,v1,2/4] qtest: unbreak non-TCG builds in bios-tables-test

Message ID 20201009152108.16120-3-cfontana@suse.de
State New
Headers show
Series unbreak non-tcg builds | expand

Commit Message

Claudio Fontana Oct. 9, 2020, 3:21 p.m. UTC 
the tests assume TCG is available, thus breaking
for TCG-only tests, where only the TCG accelerator option
is passed to the QEMU binary.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
 tests/qtest/bios-tables-test.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Paolo Bonzini Oct. 9, 2020, 4:01 p.m. UTC | #1 
On 09/10/20 17:21, Claudio Fontana wrote:
> the tests assume TCG is available, thus breaking

> for TCG-only tests, where only the TCG accelerator option

> is passed to the QEMU binary.

> 

> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>

> Signed-off-by: Claudio Fontana <cfontana@suse.de>

> ---

>  tests/qtest/bios-tables-test.c | 10 ++++++++++

>  1 file changed, 10 insertions(+)

> 

> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c

> index e15f36c8c7..e783da54ba 100644

> --- a/tests/qtest/bios-tables-test.c

> +++ b/tests/qtest/bios-tables-test.c

> @@ -122,6 +122,9 @@ static void free_test_data(test_data *data)

>  {

>      int i;

>  

> +    if (!data->tables) {

> +        return;

> +    }

>      for (i = 0; i < data->tables->len; ++i) {

>          cleanup_table_descriptor(&g_array_index(data->tables, AcpiSdtTable, i));

>      }

> @@ -651,6 +654,13 @@ static void test_acpi_one(const char *params, test_data *data)

>      char *args;

>      bool use_uefi = data->uefi_fl1 && data->uefi_fl2;

>  

> +#ifndef CONFIG_TCG

> +    if (data->tcg_only) {

> +        g_test_skip("TCG disabled, skipping ACPI tcg_only test");

> +        return;

> +    }

> +#endif /* CONFIG_TCG */

> +

>      if (use_uefi) {

>          /*

>           * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)

> 


Acked-by: Paolo Bonzini <pbonzini@redhat.com>
diff mbox series

Patch

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index e15f36c8c7..e783da54ba 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -122,6 +122,9 @@  static void free_test_data(test_data *data)
 {
     int i;
 
+    if (!data->tables) {
+        return;
+    }
     for (i = 0; i < data->tables->len; ++i) {
         cleanup_table_descriptor(&g_array_index(data->tables, AcpiSdtTable, i));
     }
@@ -651,6 +654,13 @@  static void test_acpi_one(const char *params, test_data *data)
     char *args;
     bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
 
+#ifndef CONFIG_TCG
+    if (data->tcg_only) {
+        g_test_skip("TCG disabled, skipping ACPI tcg_only test");
+        return;
+    }
+#endif /* CONFIG_TCG */
+
     if (use_uefi) {
         /*
          * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)