On Thu, Jan 30, 2020 at 04:28:52PM +0000, Liam Merwick wrote:
> On 30/01/2020 15:34, Liam Merwick wrote:
> > On 30/01/2020 11:27, Stefano Garzarella wrote:
> > > Hi Liam,
> > >
> > > On Mon, Jan 27, 2020 at 04:36:30PM +0000, Liam Merwick wrote:
> > > > Add tests to use qboot with the 'pc' and 'microvm' machine classes
> > > > by adding the '-bios' option via self.vm.add_args() before calling
> > > > do_test_x86_64_machine().
> > > >
> > > > Signed-off-by: Liam Merwick <liam.merw...@oracle.com>
> > > > ---
> > > > tests/acceptance/boot_linux_console.py | 15 ++++++++++++++-
> > > > 1 file changed, 14 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/tests/acceptance/boot_linux_console.py
> > > > b/tests/acceptance/boot_linux_console.py
> > > > index aa5b07b1c609..8daf6461ffac 100644
> > > > --- a/tests/acceptance/boot_linux_console.py
> > > > +++ b/tests/acceptance/boot_linux_console.py
> >
> > ...
> >
> > > > + def test_x86_64_microvm_qboot(self):
> > > > + """
> > > > + :avocado: tags=machine:microvm
> > > > + """
> > > > + self.vm.add_args('-bios', 'pc-bios/bios-microvm.bin')
> > > > + self.do_test_x86_64_machine()
> > > > +
> > >
> > > Reading the docs/microvm.rst, microvm should use qboot as default, so
> > > the test_x86_64_microvm() and test_x86_64_microvm_qboot() maybe are the
> > > same (I didn't test them).
> >
> > I traced loader_write_rom() and in both cases bios-microvm.bin got
> > loaded. While there may be a slight benefit in verifying that usage of
> > an explicit -bios works, I think I'll just drop the unnecessary test
> > case in patches 2 and 6 in v2.
> >
>
> When making that change to remove the test case from Patch2, it dawned
> on me that it might be worth testing microvm with a different bios
> instead...
Make sense! In docs/microvm.rst we say we support both, so it seems
reasonable to test even seabios.
Thanks,
Stefano
>
> --- a/tests/acceptance/boot_linux_console.py
> +++ b/tests/acceptance/boot_linux_console.py
> @@ -87,6 +87,13 @@ class BootLinuxConsole(Test):
> """
> self.do_test_x86_64_machine()
>
> + def test_x86_64_microvm_seabios(self):
> + """
> + :avocado: tags=machine:microvm
> + """
> + self.vm.add_args('-bios', 'pc-bios/bios.bin')
> + self.do_test_x86_64_machine()
> +
