This split in two the boot Linux test for aarch64: one that uses
KVM acceleration and another with TCG. It changes -cpu to 'max'
which is a common match between kvm and tcg.
Note: on kvm test, even though it is tagged with 'machine:virt', it later
has the value overwritten to pass the GIC version. The reason for that
is an Avocado limitation, which is unable to parse correctly a
tag containing ',' (this char being a tag delimiter). Keep the
'machine:virt' tag is still useful since it can be used on tests
filtering.
Signed-off-by: Wainer dos Santos Moschetta <waine...@redhat.com>
---
tests/acceptance/boot_linux_console.py | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/tests/acceptance/boot_linux_console.py
b/tests/acceptance/boot_linux_console.py
index fc72cdde0d..76a66ee533 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -270,11 +270,7 @@ class BootLinuxConsole(Test):
kernel_hash = '18d1c68f2e23429e266ca39ba5349ccd0aeb7180'
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
- def test_aarch64_virt(self):
- """
- :avocado: tags=arch:aarch64
- :avocado: tags=machine:virt
- """
+ def do_test_aarch64_virt(self):
kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
'/linux/releases/29/Everything/aarch64/os/images/pxeboot'
'/vmlinuz')
@@ -284,13 +280,30 @@ class BootLinuxConsole(Test):
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
'console=ttyAMA0')
- self.vm.add_args('-cpu', 'cortex-a53',
+ self.vm.add_args('-cpu', 'max',
'-kernel', kernel_path,
'-append', kernel_command_line)
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern)
+ def test_aarch64_virt_kvm(self):
+ """
+ :avocado: tags=arch:aarch64
+ :avocado: tags=machine:virt
+ :avocado: tags=accel:kvm
+ """
+ self.vm.set_machine('virt,gic-version=max')
+ self.do_test_aarch64_virt()
+
+ def test_aarch64_virt_tcg(self):
+ """
+ :avocado: tags=arch:aarch64
+ :avocado: tags=machine:virt
+ :avocado: tags=accel:tcg
+ """
+ self.do_test_aarch64_virt()
+
def test_arm_virt(self):
"""
:avocado: tags=arch:arm
--
2.24.1
