motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/functional: Have microblaze tests inherit common parent class

Browse source 
Have the MicroblazeMachine class being common to both
MicroblazeBigEndianMachine and MicroblazeLittleEndianMachine
classes. Move the xmaton and ballerina tests to the parent class.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250212123659.52764-11-philmd@linaro.org>
[thuth: Add missing ASSET statements to the leaf classes]
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2025-02-12 13:36:59 +01:00 • committed by Thomas Huth
parent b69801dd6b
commit 4098c6b7b6
2 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tests/functional/test_microblaze_s3adsp1800.py
View file

@ -7,6 +7,7 @@
# This work is licensed under the terms of the GNU GPL, version 2 or # This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
from qemu_test import exec_command_and_wait_for_pattern
from qemu_test import QemuSystemTest, Asset from qemu_test import QemuSystemTest, Asset
from qemu_test import wait_for_console_pattern from qemu_test import wait_for_console_pattern
@ -20,6 +21,10 @@ class MicroblazeMachine(QemuSystemTest):
'day17.tar.xz'), 'day17.tar.xz'),
'3ba7439dfbea7af4876662c97f8e1f0cdad9231fc166e4861d17042489270057') '3ba7439dfbea7af4876662c97f8e1f0cdad9231fc166e4861d17042489270057')
ASSET_IMAGE_LE = Asset(
('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
def do_ballerina_be_test(self, machine): def do_ballerina_be_test(self, machine):
self.set_machine(machine) self.set_machine(machine)
self.archive_extract(self.ASSET_IMAGE_BE) self.archive_extract(self.ASSET_IMAGE_BE)
@ -34,8 +39,30 @@ class MicroblazeMachine(QemuSystemTest):
# message, that's why we don't test for a later string here. This # message, that's why we don't test for a later string here. This
# needs some investigation by a microblaze wizard one day... # needs some investigation by a microblaze wizard one day...
def do_xmaton_le_test(self, machine):
self.require_netdev('user')
self.set_machine(machine)
self.archive_extract(self.ASSET_IMAGE_LE)
self.vm.set_console()
self.vm.add_args('-kernel', self.scratch_file('day13', 'xmaton.bin'))
tftproot = self.scratch_file('day13')
self.vm.add_args('-nic', f'user,tftp={tftproot}')
self.vm.launch()
wait_for_console_pattern(self, 'QEMU Advent Calendar 2023')
wait_for_console_pattern(self, 'buildroot login:')
exec_command_and_wait_for_pattern(self, 'root', '#')
exec_command_and_wait_for_pattern(self,
'tftp -g -r xmaton.png 10.0.2.2 ; md5sum xmaton.png',
'821cd3cab8efd16ad6ee5acc3642a8ea')
class MicroblazeBigEndianMachine(MicroblazeMachine):
ASSET_IMAGE_BE = MicroblazeMachine.ASSET_IMAGE_BE
def test_microblaze_s3adsp1800_legacy_be(self): def test_microblaze_s3adsp1800_legacy_be(self):
self.do_ballerina_be_test('petalogix-s3adsp1800') self.do_ballerina_be_test('petalogix-s3adsp1800')
if __name__ == '__main__': if __name__ == '__main__':
QemuSystemTest.main() QemuSystemTest.main()

31
tests/functional/test_microblazeel_s3adsp1800.py
View file

@ -7,37 +7,16 @@
# This work is licensed under the terms of the GNU GPL, version 2 or # This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
from qemu_test import exec_command_and_wait_for_pattern from test_microblaze_s3adsp1800 import MicroblazeMachine
from qemu_test import QemuSystemTest, Asset
from qemu_test import wait_for_console_pattern
class MicroblazeelMachine(QemuSystemTest): class MicroblazeLittleEndianMachine(MicroblazeMachine):
timeout = 90 ASSET_IMAGE_LE = MicroblazeMachine.ASSET_IMAGE_LE
ASSET_IMAGE_LE = Asset(
('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
def do_xmaton_le_test(self, machine):
self.require_netdev('user')
self.set_machine(machine)
self.archive_extract(self.ASSET_IMAGE_LE)
self.vm.set_console()
self.vm.add_args('-kernel', self.scratch_file('day13', 'xmaton.bin'))
tftproot = self.scratch_file('day13')
self.vm.add_args('-nic', f'user,tftp={tftproot}')
self.vm.launch()
wait_for_console_pattern(self, 'QEMU Advent Calendar 2023')
wait_for_console_pattern(self, 'buildroot login:')
exec_command_and_wait_for_pattern(self, 'root', '#')
exec_command_and_wait_for_pattern(self,
'tftp -g -r xmaton.png 10.0.2.2 ; md5sum xmaton.png',
'821cd3cab8efd16ad6ee5acc3642a8ea')
def test_microblaze_s3adsp1800_legacy_le(self): def test_microblaze_s3adsp1800_legacy_le(self):
self.do_xmaton_le_test('petalogix-s3adsp1800') self.do_xmaton_le_test('petalogix-s3adsp1800')
if __name__ == '__main__': if __name__ == '__main__':
QemuSystemTest.main() MicroblazeMachine.main()