mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
tests/acceptance: Re-enable the microblaze test
The microblaze kernel sometimes gets stuck during boot (ca. 1 out of 200 times), so we disabled the corresponding acceptance tests some months ago. However, it's likely better to check that the kernel is still starting than to not testing it at all anymore. Move the test to a separate file, enable it again and check for an earlier console message that should always appear. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Message-Id: <20210128152815.585478-1-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
parent
299ab1b0ce
commit
ee6c14d016
|
@ -1119,6 +1119,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
|||
S: Maintained
|
||||
F: hw/microblaze/petalogix_s3adsp1800_mmu.c
|
||||
F: include/hw/char/xilinx_uartlite.h
|
||||
F: tests/acceptance/machine_microblaze.py
|
||||
|
||||
petalogix_ml605
|
||||
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
||||
|
|
|
@ -1056,15 +1056,6 @@ def test_m68k_mcf5208evb(self):
|
|||
tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c'
|
||||
self.do_test_advcal_2018('07', tar_hash, 'sanity-clause.elf')
|
||||
|
||||
@skip("Test currently broken") # Console stuck as of 5.2-rc1
|
||||
def test_microblaze_s3adsp1800(self):
|
||||
"""
|
||||
:avocado: tags=arch:microblaze
|
||||
:avocado: tags=machine:petalogix-s3adsp1800
|
||||
"""
|
||||
tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f'
|
||||
self.do_test_advcal_2018('17', tar_hash, 'ballerina.bin')
|
||||
|
||||
def test_or1k_sim(self):
|
||||
"""
|
||||
:avocado: tags=arch:or1k
|
||||
|
|
35
tests/acceptance/machine_microblaze.py
Normal file
35
tests/acceptance/machine_microblaze.py
Normal file
|
@ -0,0 +1,35 @@
|
|||
# Functional test that boots a microblaze Linux kernel and checks the console
|
||||
#
|
||||
# Copyright (c) 2018, 2021 Red Hat, Inc.
|
||||
#
|
||||
# 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 avocado_qemu import Test
|
||||
from avocado_qemu import wait_for_console_pattern
|
||||
from avocado.utils import archive
|
||||
|
||||
class MicroblazeMachine(Test):
|
||||
|
||||
timeout = 90
|
||||
|
||||
def test_microblaze_s3adsp1800(self):
|
||||
"""
|
||||
:avocado: tags=arch:microblaze
|
||||
:avocado: tags=machine:petalogix-s3adsp1800
|
||||
"""
|
||||
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day17.tar.xz')
|
||||
tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f'
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
archive.extract(file_path, self.workdir)
|
||||
self.vm.set_console()
|
||||
self.vm.add_args('-kernel', self.workdir + '/day17/ballerina.bin')
|
||||
self.vm.launch()
|
||||
wait_for_console_pattern(self, 'This architecture does not have '
|
||||
'kernel memory protection')
|
||||
# Note:
|
||||
# The kernel sometimes gets stuck after the "This architecture ..."
|
||||
# message, that's why we don't test for a later string here. This
|
||||
# needs some investigation by a microblaze wizard one day...
|
Loading…
Reference in a new issue