[PATCH] tests/qtest: skip m48t59-test if the machine is not absent

[PATCH] tests/qtest: skip m48t59-test if the machine is not absent

[Paolo Bonzini]

Together with the series at https://patchew.org/QEMU/20240423131612.28362-1-pbonzini@redhat.com/,
this allows adding sparc-softmmu to the target list of the
build-without-defaults CI job.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/qtest/m48t59-test.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c
index b9cd209165a..605797ab785 100644
--- a/tests/qtest/m48t59-test.c
+++ b/tests/qtest/m48t59-test.c
@@ -262,11 +262,12 @@ int main(int argc, char **argv)
     base_setup();
 
     g_test_init(&argc, &argv, NULL);
-
-    if (g_test_slow()) {
-        /* Do not run this in timing-sensitive environments */
-        qtest_add_func("/rtc/bcd-check-time", bcd_check_time);
+    if (qtest_has_machine(base_machine)) {
+        if (g_test_slow()) {
+            /* Do not run this in timing-sensitive environments */
+            qtest_add_func("/rtc/bcd-check-time", bcd_check_time);
+        }
+        qtest_add_func("/rtc/fuzz-registers", fuzz_registers);
     }
-    qtest_add_func("/rtc/fuzz-registers", fuzz_registers);
     return g_test_run();
 }
-- 
2.44.0

Re: [PATCH] tests/qtest: skip m48t59-test if the machine is not absent

[Richard Henderson]

On 5/3/24 01:51, Paolo Bonzini wrote:
> Together with the series at https://patchew.org/QEMU/20240423131612.28362-1-pbonzini@redhat.com/,
> this allows adding sparc-softmmu to the target list of the
> build-without-defaults CI job.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   tests/qtest/m48t59-test.c | 11 ++++++-----
>   1 file changed, 6 insertions(+), 5 deletions(-)

s/absent/present/ in subject.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

> 
> diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c
> index b9cd209165a..605797ab785 100644
> --- a/tests/qtest/m48t59-test.c
> +++ b/tests/qtest/m48t59-test.c
> @@ -262,11 +262,12 @@ int main(int argc, char **argv)
>       base_setup();
>   
>       g_test_init(&argc, &argv, NULL);
> -
> -    if (g_test_slow()) {
> -        /* Do not run this in timing-sensitive environments */
> -        qtest_add_func("/rtc/bcd-check-time", bcd_check_time);
> +    if (qtest_has_machine(base_machine)) {
> +        if (g_test_slow()) {
> +            /* Do not run this in timing-sensitive environments */
> +            qtest_add_func("/rtc/bcd-check-time", bcd_check_time);
> +        }
> +        qtest_add_func("/rtc/fuzz-registers", fuzz_registers);
>       }
> -    qtest_add_func("/rtc/fuzz-registers", fuzz_registers);
>       return g_test_run();
>   }