mirror of
https://github.com/qemu/qemu.git
synced 2026-07-08 17:46:10 +00:00
d1edce955d
The boot completion check in AspeedTest waits for the systemd "Hostname set to" message, which occasionally causes intermittent test timeouts, e.g. on ast2500 SoC machines. The root cause seems to be console output interleaving of both systemd and the getty login process. This results in the expected pattern string being broken up. Unify and simplify all boot completion checks by looking for the generic 'login:' substring in AspeedTest.wait_for_boot_complete(). With the override gone, remove the redundant FacebookAspeedTest class and update the Anacapa, Bletchley, and Catalina tests to inherit directly from AspeedTest. Also drop the now-dead image_hostname parameter from do_test_arm_aspeed_openbmc(). Reported-by: Peter Maydell <peter.maydell@linaro.org> Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3117 Signed-off-by: Cédric Le Goater <clg@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-ID: <20260617042718.2883655-1-clg@redhat.com> Signed-off-by: Thomas Huth <th.huth@posteo.eu>
67 lines
2.8 KiB
Python
67 lines
2.8 KiB
Python
# Test class to boot aspeed machines
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
from qemu_test import exec_command_and_wait_for_pattern
|
|
from qemu_test import LinuxKernelTest
|
|
|
|
class AspeedTest(LinuxKernelTest):
|
|
|
|
def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04',
|
|
cpu_id='0x0', soc='AST2500 rev A1'):
|
|
self.set_machine(machine)
|
|
self.vm.set_console()
|
|
self.vm.add_args('-drive', f'file={image},if=mtd,format=raw',
|
|
'-snapshot')
|
|
self.vm.launch()
|
|
|
|
self.wait_for_console_pattern(f'U-Boot {uboot}')
|
|
self.wait_for_console_pattern('## Loading kernel from FIT Image')
|
|
self.wait_for_console_pattern('Starting kernel ...')
|
|
self.wait_for_console_pattern(f'Booting Linux on physical CPU {cpu_id}')
|
|
self.wait_for_console_pattern(f'ASPEED {soc}')
|
|
self.wait_for_console_pattern('/init as init process')
|
|
self.wait_for_boot_complete()
|
|
|
|
def wait_for_boot_complete(self):
|
|
self.wait_for_console_pattern('login:')
|
|
|
|
def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
|
|
self.require_netdev('user')
|
|
self.vm.set_console()
|
|
self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw,read-only=true',
|
|
'-net', 'nic', '-net', 'user')
|
|
self.vm.launch()
|
|
|
|
self.wait_for_console_pattern('U-Boot 2019.04')
|
|
self.wait_for_console_pattern('## Loading kernel from FIT Image')
|
|
self.wait_for_console_pattern('Starting kernel ...')
|
|
self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id)
|
|
self.wait_for_console_pattern('lease of 10.0.2.15')
|
|
# the line before login:
|
|
self.wait_for_console_pattern(pattern)
|
|
exec_command_and_wait_for_pattern(self, 'root', 'Password:')
|
|
exec_command_and_wait_for_pattern(self, 'passw0rd', '#')
|
|
|
|
def do_test_arm_aspeed_buildroot_poweroff(self):
|
|
exec_command_and_wait_for_pattern(self, 'poweroff',
|
|
'System halted')
|
|
|
|
def do_test_arm_aspeed_sdk_start(self, image):
|
|
self.require_netdev('user')
|
|
self.vm.set_console()
|
|
self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
|
|
'-net', 'nic', '-net', 'user', '-snapshot')
|
|
self.vm.launch()
|
|
|
|
self.wait_for_console_pattern('U-Boot 2019.04')
|
|
self.wait_for_console_pattern('## Loading kernel from FIT Image')
|
|
self.wait_for_console_pattern('Starting kernel ...')
|
|
|
|
def generate_otpmem_image(self):
|
|
path = self.scratch_file("otpmem.img")
|
|
pattern = b'\x00\x00\x00\x00\xff\xff\xff\xff' * (16 * 1024 // 8)
|
|
with open(path, "wb") as f:
|
|
f.write(pattern)
|
|
return path
|