qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: does make check now require TCG? Or is it a parallelism issue?


From: Claudio Fontana
Subject: Re: does make check now require TCG? Or is it a parallelism issue?
Date: Fri, 9 Oct 2020 12:28:03 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0

On 10/9/20 9:40 AM, Paolo Bonzini wrote:
> On 08/10/20 23:07, Claudio Fontana wrote:
>> qtests are also broken for me now with --disable-tcg build,
>> it _seems_ to me that TCG-only tests are being run for --disable-tcg too.
>>
>> I am not sure if this is a test problem (for example 
>> tests/qtest/bios-tables-test.c): data->tcg_only
>> or if it is a build system problem, or some combination.
> 
> Yes, this is due to tcg_only.  But since CONFIG_TCG is included in
> config-host.mak, it should be easy to add a call to g_test_skip.
> 
> Paolo
> 
> 

I am trying to wrap my head around this, but I got lost in 
scripts/tap-driver.pl .

I tried the following:

commit 27db7fa56fcb3d23e0f125701f65248a70fa1242
Author: Claudio Fontana <cfontana@suse.de>
Date:   Fri Oct 9 10:23:26 2020 +0200

    qtest: unbreak non-TCG builds in bios-tables-test
    
    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>

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index e15f36c8c7..5f17289964 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -651,6 +651,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)
---------------------------------------------------------------------------------------------------

but I get:

cd build-nontcg
make -j12
make -j12 check-qtest

Running test qtest-x86_64: qos-test
ERROR qtest-x86_64: bios-tables-test - too few tests run (expected 23, got 22)
make: *** [Makefile.mtest:1326: run-test-187] Error 1
make: *** Waiting for unfinished jobs....

What am I missing here?

Thanks,

Claudio




reply via email to

[Prev in Thread] Current Thread [Next in Thread]