diff mbox series

[1/5] qtest/meson.build: check CONFIG_TCG for prom-env-test in qtests_ppc

Message ID 20220303153517.168943-2-danielhb413@gmail.com (mailing list archive)
State New, archived
Headers show
Series --disable-tcg qtest/avocado fixes for ppc64 | expand

Commit Message

Daniel Henrique Barboza March 3, 2022, 3:35 p.m. UTC
'prom-env-test' is a TCG test that will fail if QEMU is compiled with
--disable-tcg:

$ QTEST_QEMU_BINARY=./qemu-system-ppc64 ./tests/qtest/prom-env-test
/ppc64/prom-env/mac99: qemu-system-ppc64: -accel tcg: invalid accelerator tcg
(... hangs indefinitely ...)

Fix it by checking CONFIG_TCG before compiling prom-env-test.

Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
 tests/qtest/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Thomas Huth March 7, 2022, 7:57 a.m. UTC | #1
On 03/03/2022 16.35, Daniel Henrique Barboza wrote:
> 'prom-env-test' is a TCG test that will fail if QEMU is compiled with
> --disable-tcg:
> 
> $ QTEST_QEMU_BINARY=./qemu-system-ppc64 ./tests/qtest/prom-env-test
> /ppc64/prom-env/mac99: qemu-system-ppc64: -accel tcg: invalid accelerator tcg
> (... hangs indefinitely ...)
> 
> Fix it by checking CONFIG_TCG before compiling prom-env-test.

I guess it could be made somehow working by using KVM-PR for the mac 
machines ... but considering the bad shape of KVM-PR nowadays, I think it's 
fair to limit the test to TCG-only now.

Reviewed-by: Thomas Huth <thuth@redhat.com>


> Cc: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> ---
>   tests/qtest/meson.build | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index f33d84d19b..0c2f2d94e1 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -160,7 +160,8 @@ qtests_ppc = \
>     (slirp.found() ? ['test-netfilter'] : []) + \
>     (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) +            \
>     (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) +                     \
> -  ['boot-order-test', 'prom-env-test', 'boot-serial-test']                 \
> +  (config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) +                      \
> +  ['boot-order-test', 'boot-serial-test']
>   
>   qtests_ppc64 = \
>     qtests_ppc + \
diff mbox series

Patch

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index f33d84d19b..0c2f2d94e1 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -160,7 +160,8 @@  qtests_ppc = \
   (slirp.found() ? ['test-netfilter'] : []) + \
   (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) +            \
   (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) +                     \
-  ['boot-order-test', 'prom-env-test', 'boot-serial-test']                 \
+  (config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) +                      \
+  ['boot-order-test', 'boot-serial-test']
 
 qtests_ppc64 = \
   qtests_ppc + \