Re: [Qemu-devel] [PATCH 2/2] tests: fix modules-test with no default machine

[Alex Bennée]

Peter Maydell <address@hidden> writes:

> On Tue, 27 Aug 2019 at 15:46, Thomas Huth <address@hidden> wrote:
>>
>> On 27/08/2019 16.02, Marc-André Lureau wrote:
>> > Fixes: eb062cfa733 ("tests: add module loading test")
>> > Signed-off-by: Marc-André Lureau <address@hidden>
>> > ---
>> >  tests/modules-test.c | 4 +++-
>> >  1 file changed, 3 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/tests/modules-test.c b/tests/modules-test.c
>> > index a8118e9042..d1a6ace218 100644
>> > --- a/tests/modules-test.c
>> > +++ b/tests/modules-test.c
>> > @@ -1,12 +1,14 @@
>> >  #include "qemu/osdep.h"
>> >  #include "libqtest.h"
>> >
>> > +const char common_args[] = "-nodefaults -machine none";
>>
>> "-nodefaults" likely does not do much with the "none" machine ... OTOH,
>> it also does not hurt here.
>>
>> >  static void test_modules_load(const void *data)
>> >  {
>> >      QTestState *qts;
>> >      const char **args = (const char **)data;
>> >
>> > -    qts = qtest_init(NULL);
>> > +    qts = qtest_init(common_args);
>> >      qtest_module_load(qts, args[0], args[1]);
>> >      qtest_quit(qts);
>> >  }
>> >
>>
>> Reviewed-by: Thomas Huth <address@hidden>
>>
>> Peter, will you apply this directly as a fix for the travis builds, or
>> shall I take it through the qtest tree?
>
> I'm happy to take it directly (assuming patch 1/2 doesn't
> have anything too big in it -- it hasn't arrived here yet.)

I've been testing this in my testing/next tree and as you're not back
until tomorrow I can have these sitting in the PR I'm pulling together
now if that's ok.

>
> thanks
> -- PMM


--
Alex Bennée