meson: test for CONFIG_TCG in config_all

[PATCH] meson: test for CONFIG_TCG in config_all

Posted by Paolo Bonzini 8 months ago

CONFIG_TCG is not included in *-config-devices.h, so the test is
always failing.

Fixes: 74884cb1a6d ("qtest/meson.build: check CONFIG_TCG for boot-serial-test in qtests_ppc", 2022-03-14)
Fixes: 44d827ea69e ("qtest/meson.build: check CONFIG_TCG for prom-env-test in qtests_ppc", 2022-03-14)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/qtest/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index df63909ee51..c0751ef7c35 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -155,8 +155,8 @@ qtests_ppc = \
   qtests_filter + \
   (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) +            \
   (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) +                     \
-  (config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) +                      \
-  (config_all_devices.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) +                   \
+  (config_all.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) +                              \
+  (config_all.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) +                           \
   ['boot-order-test']
 
 qtests_ppc64 = \
-- 
2.41.0

Re: [PATCH] meson: test for CONFIG_TCG in config_all

Posted by Thomas Huth 8 months ago

On 30/08/2023 11.53, Paolo Bonzini wrote:
> CONFIG_TCG is not included in *-config-devices.h, so the test is
> always failing.
> 
> Fixes: 74884cb1a6d ("qtest/meson.build: check CONFIG_TCG for boot-serial-test in qtests_ppc", 2022-03-14)
> Fixes: 44d827ea69e ("qtest/meson.build: check CONFIG_TCG for prom-env-test in qtests_ppc", 2022-03-14)
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   tests/qtest/meson.build | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index df63909ee51..c0751ef7c35 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -155,8 +155,8 @@ qtests_ppc = \
>     qtests_filter + \
>     (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) +            \
>     (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) +                     \
> -  (config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) +                      \
> -  (config_all_devices.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) +                   \
> +  (config_all.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) +                              \
> +  (config_all.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) +                           \
>     ['boot-order-test']

D'oh!

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

Re: [PATCH] meson: test for CONFIG_TCG in config_all

Posted by Philippe Mathieu-Daudé 8 months ago

On 30/8/23 11:53, Paolo Bonzini wrote:
> CONFIG_TCG is not included in *-config-devices.h, so the test is
> always failing.
> 
> Fixes: 74884cb1a6d ("qtest/meson.build: check CONFIG_TCG for boot-serial-test in qtests_ppc", 2022-03-14)
> Fixes: 44d827ea69e ("qtest/meson.build: check CONFIG_TCG for prom-env-test in qtests_ppc", 2022-03-14)
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   tests/qtest/meson.build | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>