|
From: | Wainer dos Santos Moschetta |
Subject: | Re: [PATCH v2 2/6] tests/boot_linux_console: add BIOS acceptance test |
Date: | Wed, 19 Feb 2020 16:20:06 -0300 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 |
On 2/6/20 12:12 PM, Philippe Mathieu-Daudé wrote:
On 2/5/20 3:56 PM, Liam Merwick wrote:Add a test to use qboot with the 'pc' machine class and SeaBIOS with the 'microvm' machine class (since microvm uses qboot by default) by adding the '-bios' option via self.vm.add_args() before calling do_test_x86_64_machine(). Signed-off-by: Liam Merwick <address@hidden> Reviewed-by: Stefano Garzarella <address@hidden> --- tests/acceptance/boot_linux_console.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.pyindex 233601b429bd..e9375590bc1c 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -61,7 +61,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, @@ -77,6 +76,14 @@ class BootLinuxConsole(Test): """ self.do_test_x86_64_machine() + def test_x86_64_pc_qboot(self): + """ + :avocado: tags=arch:x86_64 + :avocado: tags=machine:pc + """ + self.vm.add_args('-bios', 'pc-bios/bios-microvm.bin')
The test boots QEMU with bios file from $PWD/pc-bios/bios-microvm.bin. If you want to get (optionally) the file from an installed QEMU you could use Avocado test parameters [1]. Here goes an example:
self.vm.add_args('-bios', self.params.get('bios_microvm', default='pc-bios/bios-microvm.bin'))
Then you evoke avocado as: $ avocado run -p bios_microvm=/usr/share/qemu/bios-microvm.bin (...)[1] https://avocado-framework.readthedocs.io/en/75.1/guides/writer/chapters/parameters.html
This breaks running once QEMU is installed:(2/4) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_x86_64_pc_qboot:qemu: could not load PC BIOS 'pc-bios/bios-microvm.bin' ERROR: [Errno 104] Connection reset by peer (0.08 s) Cleber, Wainer, what path should we use?
Philippe, above answers your question? Thanks, - Wainer
+ self.do_test_x86_64_machine() + def test_x86_64_microvm(self): """ :avocado: tags=arch:x86_64 @@ -84,6 +91,14 @@ class BootLinuxConsole(Test): """ self.do_test_x86_64_machine() + def test_x86_64_microvm_seabios(self): + """ + :avocado: tags=arch:x86_64 + :avocado: tags=machine:microvm + """ + self.vm.add_args('-bios', 'pc-bios/bios.bin') + self.do_test_x86_64_machine() + def test_mips_malta(self): """ :avocado: tags=arch:mips
[Prev in Thread] | Current Thread | [Next in Thread] |