mirror of https://github.com/xemu-project/xemu.git
tests/avocado: retire the Aarch64 TCG tests from boot_linux.py
The two TCG tests for GICv2 and GICv3 are very heavy weight distros
that take a long time to boot up, especially for an --enable-debug
build. The total code coverage they give is:
Overall coverage rate:
lines......: 11.2% (59584 of 530123 lines)
functions..: 15.0% (7436 of 49443 functions)
branches...: 6.3% (19273 of 303933 branches)
We already get pretty close to that with the machine_aarch64_virt
tests which only does one full boot (~120s vs ~600s) of alpine. We
expand the kernel+initrd boot (~8s) to test both GICs and also add an
RNG device and a block device to generate a few IRQs and exercise the
storage layer. With that we get to a coverage of:
Overall coverage rate:
lines......: 11.0% (58121 of 530123 lines)
functions..: 14.9% (7343 of 49443 functions)
branches...: 6.0% (18269 of 303933 branches)
which I feel is close enough given the massive time saving. If we want
to target any more sub-systems we can use lighter weight more directed
tests.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230203181632.2919715-1-alex.bennee@linaro.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Alex Bennée
Peter Maydell
parent
165876f22c
commit
dbba45e6aa
|
|
@ -58,52 +58,16 @@ class BootLinuxX8664(LinuxTest):
|
|||
self.launch_and_wait(set_up_ssh_connection=False)
|
||||
|
||||
|
||||
# For Aarch64 we only boot KVM tests in CI as the TCG tests are very
|
||||
# heavyweight. There are lighter weight distros which we use in the
|
||||
# machine_aarch64_virt.py tests.
|
||||
# For Aarch64 we only boot KVM tests in CI as booting the current
|
||||
# Fedora OS in TCG tests is very heavyweight. There are lighter weight
|
||||
# distros which we use in the machine_aarch64_virt.py tests.
|
||||
class BootLinuxAarch64(LinuxTest):
|
||||
"""
|
||||
:avocado: tags=arch:aarch64
|
||||
:avocado: tags=machine:virt
|
||||
:avocado: tags=machine:gic-version=2
|
||||
"""
|
||||
timeout = 720
|
||||
|
||||
def add_common_args(self):
|
||||
self.vm.add_args('-bios',
|
||||
os.path.join(BUILD_DIR, 'pc-bios',
|
||||
'edk2-aarch64-code.fd'))
|
||||
self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0')
|
||||
self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom')
|
||||
|
||||
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
|
||||
def test_fedora_cloud_tcg_gicv2(self):
|
||||
"""
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=cpu:max
|
||||
:avocado: tags=device:gicv2
|
||||
"""
|
||||
self.require_accelerator("tcg")
|
||||
self.vm.add_args("-accel", "tcg")
|
||||
self.vm.add_args("-cpu", "max,lpa2=off")
|
||||
self.vm.add_args("-machine", "virt,gic-version=2")
|
||||
self.add_common_args()
|
||||
self.launch_and_wait(set_up_ssh_connection=False)
|
||||
|
||||
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
|
||||
def test_fedora_cloud_tcg_gicv3(self):
|
||||
"""
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=cpu:max
|
||||
:avocado: tags=device:gicv3
|
||||
"""
|
||||
self.require_accelerator("tcg")
|
||||
self.vm.add_args("-accel", "tcg")
|
||||
self.vm.add_args("-cpu", "max,lpa2=off")
|
||||
self.vm.add_args("-machine", "virt,gic-version=3")
|
||||
self.add_common_args()
|
||||
self.launch_and_wait(set_up_ssh_connection=False)
|
||||
|
||||
def test_virt_kvm(self):
|
||||
"""
|
||||
:avocado: tags=accel:kvm
|
||||
|
|
@ -112,7 +76,11 @@ class BootLinuxAarch64(LinuxTest):
|
|||
self.require_accelerator("kvm")
|
||||
self.vm.add_args("-accel", "kvm")
|
||||
self.vm.add_args("-machine", "virt,gic-version=host")
|
||||
self.add_common_args()
|
||||
self.vm.add_args('-bios',
|
||||
os.path.join(BUILD_DIR, 'pc-bios',
|
||||
'edk2-aarch64-code.fd'))
|
||||
self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0')
|
||||
self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom')
|
||||
self.launch_and_wait(set_up_ssh_connection=False)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,14 @@
|
|||
|
||||
import time
|
||||
import os
|
||||
import logging
|
||||
|
||||
from avocado_qemu import QemuSystemTest
|
||||
from avocado_qemu import wait_for_console_pattern
|
||||
from avocado_qemu import exec_command
|
||||
from avocado_qemu import BUILD_DIR
|
||||
from avocado.utils import process
|
||||
from avocado.utils.path import find_command
|
||||
|
||||
class Aarch64VirtMachine(QemuSystemTest):
|
||||
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
||||
|
|
@ -65,16 +68,15 @@ class Aarch64VirtMachine(QemuSystemTest):
|
|||
self.wait_for_console_pattern('Welcome to Alpine Linux 3.16')
|
||||
|
||||
|
||||
def test_aarch64_virt(self):
|
||||
def common_aarch64_virt(self, machine):
|
||||
"""
|
||||
:avocado: tags=arch:aarch64
|
||||
:avocado: tags=machine:virt
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=cpu:max
|
||||
Common code to launch basic virt machine with kernel+initrd
|
||||
and a scratch disk.
|
||||
"""
|
||||
logger = logging.getLogger('aarch64_virt')
|
||||
|
||||
kernel_url = ('https://fileserver.linaro.org/s/'
|
||||
'z6B2ARM7DQT3HWN/download')
|
||||
|
||||
kernel_hash = 'ed11daab50c151dde0e1e9c9cb8b2d9bd3215347'
|
||||
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
||||
|
||||
|
|
@ -83,13 +85,62 @@ class Aarch64VirtMachine(QemuSystemTest):
|
|||
'console=ttyAMA0')
|
||||
self.require_accelerator("tcg")
|
||||
self.vm.add_args('-cpu', 'max,pauth-impdef=on',
|
||||
'-machine', machine,
|
||||
'-accel', 'tcg',
|
||||
'-kernel', kernel_path,
|
||||
'-append', kernel_command_line)
|
||||
|
||||
# A RNG offers an easy way to generate a few IRQs
|
||||
self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0')
|
||||
self.vm.add_args('-object',
|
||||
'rng-random,id=rng0,filename=/dev/urandom')
|
||||
|
||||
# Also add a scratch block device
|
||||
logger.info('creating scratch qcow2 image')
|
||||
image_path = os.path.join(self.workdir, 'scratch.qcow2')
|
||||
qemu_img = os.path.join(BUILD_DIR, 'qemu-img')
|
||||
if not os.path.exists(qemu_img):
|
||||
qemu_img = find_command('qemu-img', False)
|
||||
if qemu_img is False:
|
||||
self.cancel('Could not find "qemu-img", which is required to '
|
||||
'create the temporary qcow2 image')
|
||||
cmd = '%s create -f qcow2 %s 8M' % (qemu_img, image_path)
|
||||
process.run(cmd)
|
||||
|
||||
# Add the device
|
||||
self.vm.add_args('-blockdev',
|
||||
f"driver=qcow2,file.driver=file,file.filename={image_path},node-name=scratch")
|
||||
self.vm.add_args('-device',
|
||||
'virtio-blk-device,drive=scratch')
|
||||
|
||||
self.vm.launch()
|
||||
self.wait_for_console_pattern('Welcome to Buildroot')
|
||||
time.sleep(0.1)
|
||||
exec_command(self, 'root')
|
||||
time.sleep(0.1)
|
||||
exec_command(self, 'dd if=/dev/hwrng of=/dev/vda bs=512 count=4')
|
||||
time.sleep(0.1)
|
||||
exec_command(self, 'md5sum /dev/vda')
|
||||
time.sleep(0.1)
|
||||
exec_command(self, 'cat /proc/interrupts')
|
||||
time.sleep(0.1)
|
||||
exec_command(self, 'cat /proc/self/maps')
|
||||
time.sleep(0.1)
|
||||
|
||||
def test_aarch64_virt_gicv3(self):
|
||||
"""
|
||||
:avocado: tags=arch:aarch64
|
||||
:avocado: tags=machine:virt
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=cpu:max
|
||||
"""
|
||||
self.common_aarch64_virt("virt,gic_version=3")
|
||||
|
||||
def test_aarch64_virt_gicv2(self):
|
||||
"""
|
||||
:avocado: tags=arch:aarch64
|
||||
:avocado: tags=machine:virt
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=cpu:max
|
||||
"""
|
||||
self.common_aarch64_virt("virt,gic-version=2")
|
||||
|
|
|
|||
Loading…
Reference in New Issue