mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/functional: Convert the powernv tests from boot_linux_console.py 

Move the tests into the already existing test_ppc64_powernv.py
file.

Message-ID: <20240920150319.81723-1-thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2024-09-20 17:03:19 +02:00
parent a94bfe1b18
commit 4f37abff1c
2 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tests/avocado/boot_linux_console.py
View File

@ -907,49 +907,3 @@ class BootLinuxConsole(LinuxKernelTest):
self.wait_for_console_pattern("SMP: Total of 2 processors activated")
self.wait_for_console_pattern("No filesystem could mount root")
def do_test_ppc64_powernv(self, proc):
self.require_accelerator("tcg")
images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
kernel_url = images_url + 'zImage.epapr'
kernel_hash = '0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd'
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash,
algorithm='sha256')
self.vm.set_console()
self.vm.add_args('-kernel', kernel_path,
'-append', 'console=tty0 console=hvc0',
'-device', 'pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0',
'-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234',
'-device', 'e1000e,bus=bridge1,addr=0x3',
'-device', 'nec-usb-xhci,bus=bridge1,addr=0x2')
self.vm.launch()
self.wait_for_console_pattern("CPU: " + proc + " generation processor")
self.wait_for_console_pattern("zImage starting: loaded")
self.wait_for_console_pattern("Run /init as init process")
# Device detection output driven by udev probing is sometimes cut off
# from console output, suspect S14silence-console init script.
def test_ppc_powernv8(self):
"""
:avocado: tags=arch:ppc64
:avocado: tags=machine:powernv8
:avocado: tags=accel:tcg
"""
self.do_test_ppc64_powernv('P8')
def test_ppc_powernv9(self):
"""
:avocado: tags=arch:ppc64
:avocado: tags=machine:powernv9
:avocado: tags=accel:tcg
"""
self.do_test_ppc64_powernv('P9')
def test_ppc_powernv10(self):
"""
:avocado: tags=arch:ppc64
:avocado: tags=machine:powernv10
:avocado: tags=accel:tcg
"""
self.do_test_ppc64_powernv('P10')

42
tests/functional/test_ppc64_powernv.py
View File

@ -7,10 +7,10 @@
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
from qemu_test import QemuSystemTest, Asset
from qemu_test import LinuxKernelTest, Asset
from qemu_test import wait_for_console_pattern
class powernvMachine(QemuSystemTest):
class powernvMachine(LinuxKernelTest):
timeout = 90
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 console=hvc0 '
@ -78,5 +78,41 @@ class powernvMachine(QemuSystemTest):
wait_for_console_pattern(self, console_pattern, self.panic_message)
wait_for_console_pattern(self, self.good_message, self.panic_message)
ASSET_EPAPR_KERNEL = Asset(
('https://github.com/open-power/op-build/releases/download/v2.7/'
'zImage.epapr'),
'0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd')
def do_test_ppc64_powernv(self, proc):
self.require_accelerator("tcg")
kernel_path = self.ASSET_EPAPR_KERNEL.fetch()
self.vm.set_console()
self.vm.add_args('-kernel', kernel_path,
'-append', 'console=tty0 console=hvc0',
'-device', 'pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0',
'-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234',
'-device', 'e1000e,bus=bridge1,addr=0x3',
'-device', 'nec-usb-xhci,bus=bridge1,addr=0x2')
self.vm.launch()
self.wait_for_console_pattern("CPU: " + proc + " generation processor")
self.wait_for_console_pattern("zImage starting: loaded")
self.wait_for_console_pattern("Run /init as init process")
# Device detection output driven by udev probing is sometimes cut off
# from console output, suspect S14silence-console init script.
def test_powernv8(self):
self.set_machine('powernv8')
self.do_test_ppc64_powernv('P8')
def test_powernv9(self):
self.set_machine('powernv9')
self.do_test_ppc64_powernv('P9')
def test_powernv10(self):
self.set_machine('powernv10')
self.do_test_ppc64_powernv('P10')
if __name__ == '__main__':
QemuSystemTest.main()
LinuxKernelTest.main()