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 > @@ -60,7 +60,6 @@ class BootLinuxConsole(Test): > '/vmlinuz') > kernel_hash = '23bebd2680757891cf7adedb033532163a792495' > kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > - > self.vm.set_console() > kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + > 'console=ttyS0' > self.vm.add_args('-kernel', kernel_path, > @@ -75,12 +74,26 @@ class BootLinuxConsole(Test): > """ > self.do_test_x86_64_machine() > > + def test_x86_64_pc_qboot(self): > + """ > + :avocado: tags=machine:pc > + """ > + self.vm.add_args('-bios', 'pc-bios/bios-microvm.bin') > + self.do_test_x86_64_machine() > + > def test_x86_64_microvm(self): > """ > :avocado: tags=machine:microvm > """ > self.do_test_x86_64_machine() > > + 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). > def test_mips_malta(self): > """ > :avocado: tags=arch:mips Thanks for doing these tests! Stefano