tests/avocado/tuxrun_baselines.py: improve code coverage for ppc64
Commit c0c8687ef0 disabled the
boot_linux.py test-case due to which the code coverage for ppc
decreased by around 2%. As per the discussion on
https://lore.kernel.org/qemu-devel/87sfdpqcy4.fsf@linaro.org/ it
was mentioned that the baseline test for ppc64 could be modified
to make up this 2% code coverage. This patch attempts to achieve
this 2% code coverage by adding various device command line
arguments (to ./qemu-system-ppc64) in the tuxrun_baselines.py
test-case.
The code coverage report with boot_linux.py, without it and finally
with these tuxrun_baselines.py changes is as follows:
With boot_linux.py
------------------
lines......: 13.8% (58006 of 420997 lines)
functions..: 20.7% (7675 of 36993 functions)
branches...: 9.2% (22146 of 240611 branches)
Without boot_linux.py (without this patch changes)
--------------------------------------------------
lines......: 11.9% (50174 of 420997 lines)
functions..: 18.8% (6947 of 36993 functions)
branches...: 7.4% (17580 of 239017 branches)
Without boot_linux.py (with this patch changes)
-----------------------------------------------
lines......: 13.8% (58287 of 420997 lines)
functions..: 20.7% (7640 of 36993 functions)
branches...: 8.4% (20223 of 240611 branches)
Rebased on Alex Benee's testing/next branch:
https://gitlab.com/stsquad/qemu/-/tree/testing/next
Signed-off-by: Kautuk Consul <kconsul@linux.vnet.ibm.com>
Reported-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230424041830.1275636-1-kconsul@linux.vnet.ibm.com>
Message-Id: <20230424092249.58552-13-alex.bennee@linaro.org>
This commit is contained in:
Kautuk Consul
Alex Bennée
parent
ab8eff7c1c
commit
6ee3624236
@ -11,6 +11,7 @@
|
||||
|
||||
import os
|
||||
import time
|
||||
import tempfile
|
||||
|
||||
from avocado import skip, skipIf
|
||||
from avocado_qemu import QemuSystemTest
|
||||
@ -72,6 +73,8 @@ class TuxRunBaselineTest(QemuSystemTest):
|
||||
# Occasionally we need extra devices to hook things up
|
||||
self.extradev = self.get_tag('extradev')
|
||||
|
||||
self.qemu_img = super().get_qemu_img()
|
||||
|
||||
def wait_for_console_pattern(self, success_message, vm=None):
|
||||
wait_for_console_pattern(self, success_message,
|
||||
failure_message='Kernel panic - not syncing',
|
||||
@ -179,6 +182,63 @@ class TuxRunBaselineTest(QemuSystemTest):
|
||||
self.vm.launch()
|
||||
self.run_tuxtest_tests(haltmsg)
|
||||
|
||||
def ppc64_common_tuxrun(self, sums, prefix):
|
||||
# add device args to command line.
|
||||
self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
|
||||
'-device', 'virtio-net,netdev=vnet')
|
||||
self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',
|
||||
'-device', '{"driver":"virtio-net-pci","netdev":'
|
||||
'"hostnet0","id":"net0","mac":"52:54:00:4c:e3:86",'
|
||||
'"bus":"pci.0","addr":"0x9"}')
|
||||
self.vm.add_args('-device', '{"driver":"qemu-xhci","p2":15,"p3":15,'
|
||||
'"id":"usb","bus":"pci.0","addr":"0x2"}')
|
||||
self.vm.add_args('-device', '{"driver":"virtio-scsi-pci","id":"scsi0"'
|
||||
',"bus":"pci.0","addr":"0x3"}')
|
||||
self.vm.add_args('-device', '{"driver":"virtio-serial-pci","id":'
|
||||
'"virtio-serial0","bus":"pci.0","addr":"0x4"}')
|
||||
self.vm.add_args('-device', '{"driver":"scsi-cd","bus":"scsi0.0"'
|
||||
',"channel":0,"scsi-id":0,"lun":0,"device_id":'
|
||||
'"drive-scsi0-0-0-0","id":"scsi0-0-0-0"}')
|
||||
self.vm.add_args('-device', '{"driver":"virtio-balloon-pci",'
|
||||
'"id":"balloon0","bus":"pci.0","addr":"0x6"}')
|
||||
self.vm.add_args('-audiodev', '{"id":"audio1","driver":"none"}')
|
||||
self.vm.add_args('-device', '{"driver":"usb-tablet","id":"input0"'
|
||||
',"bus":"usb.0","port":"1"}')
|
||||
self.vm.add_args('-device', '{"driver":"usb-kbd","id":"input1"'
|
||||
',"bus":"usb.0","port":"2"}')
|
||||
self.vm.add_args('-device', '{"driver":"VGA","id":"video0",'
|
||||
'"vgamem_mb":16,"bus":"pci.0","addr":"0x7"}')
|
||||
self.vm.add_args('-object', '{"qom-type":"rng-random","id":"objrng0"'
|
||||
',"filename":"/dev/urandom"}',
|
||||
'-device', '{"driver":"virtio-rng-pci","rng":"objrng0"'
|
||||
',"id":"rng0","bus":"pci.0","addr":"0x8"}')
|
||||
self.vm.add_args('-object', '{"qom-type":"cryptodev-backend-builtin",'
|
||||
'"id":"objcrypto0","queues":1}',
|
||||
'-device', '{"driver":"virtio-crypto-pci",'
|
||||
'"cryptodev":"objcrypto0","id":"crypto0","bus"'
|
||||
':"pci.0","addr":"0xa"}')
|
||||
self.vm.add_args('-device', '{"driver":"spapr-pci-host-bridge"'
|
||||
',"index":1,"id":"pci.1"}')
|
||||
self.vm.add_args('-device', '{"driver":"spapr-vscsi","id":"scsi1"'
|
||||
',"reg":12288}')
|
||||
self.vm.add_args('-m', '2G,slots=32,maxmem=4G',
|
||||
'-object', 'memory-backend-ram,id=ram1,size=1G',
|
||||
'-device', 'pc-dimm,id=dimm1,memdev=ram1')
|
||||
|
||||
# Create a temporary qcow2 and launch the test-case
|
||||
with tempfile.NamedTemporaryFile(prefix=prefix,
|
||||
suffix='.qcow2') as qcow2:
|
||||
process.run(self.qemu_img + ' create -f qcow2 ' +
|
||||
qcow2.name + ' 1G')
|
||||
|
||||
self.vm.add_args('-drive', 'file=' + qcow2.name +
|
||||
',format=qcow2,if=none,id='
|
||||
'drive-virtio-disk1',
|
||||
'-device', 'virtio-blk-pci,scsi=off,bus=pci.0,'
|
||||
'addr=0xb,drive=drive-virtio-disk1,id=virtio-disk1'
|
||||
',bootindex=2')
|
||||
self.common_tuxrun(csums=sums, drive="scsi-hd")
|
||||
|
||||
#
|
||||
# The tests themselves. The configuration is derived from how
|
||||
# tuxrun invokes qemu (with minor tweaks like using -blockdev
|
||||
@ -379,7 +439,7 @@ class TuxRunBaselineTest(QemuSystemTest):
|
||||
"""
|
||||
:avocado: tags=arch:ppc64
|
||||
:avocado: tags=machine:pseries
|
||||
:avocado: tags=cpu:POWER8
|
||||
:avocado: tags=cpu:POWER10
|
||||
:avocado: tags=endian:big
|
||||
:avocado: tags=console:hvc0
|
||||
:avocado: tags=tuxboot:ppc64
|
||||
@ -391,14 +451,13 @@ class TuxRunBaselineTest(QemuSystemTest):
|
||||
"1d953e81a4379e537fc8e41e05a0a59d9b453eef97aa03d47866c6c45b00bdff",
|
||||
"vmlinux" :
|
||||
"f22a9b9e924174a4c199f4c7e5d91a2339fcfe51c6eafd0907dc3e09b64ab728" }
|
||||
|
||||
self.common_tuxrun(csums=sums, drive="scsi-hd")
|
||||
self.ppc64_common_tuxrun(sums, prefix='tuxrun_ppc64_')
|
||||
|
||||
def test_ppc64le(self):
|
||||
"""
|
||||
:avocado: tags=arch:ppc64
|
||||
:avocado: tags=machine:pseries
|
||||
:avocado: tags=cpu:POWER8
|
||||
:avocado: tags=cpu:POWER10
|
||||
:avocado: tags=console:hvc0
|
||||
:avocado: tags=tuxboot:ppc64le
|
||||
:avocado: tags=image:vmlinux
|
||||
@ -409,8 +468,7 @@ class TuxRunBaselineTest(QemuSystemTest):
|
||||
"b442678c93fb8abe1f7d3bfa20556488de6b475c22c8fed363f42cf81a0a3906",
|
||||
"vmlinux" :
|
||||
"979eb61b445a010fb13e2b927126991f8ceef9c590fa2be0996c00e293e80cf2" }
|
||||
|
||||
self.common_tuxrun(csums=sums, drive="scsi-hd")
|
||||
self.ppc64_common_tuxrun(sums, prefix='tuxrun_ppc64le_')
|
||||
|
||||
def test_riscv32(self):
|
||||
"""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user