Commit 0e2c5647d9 for qemu.org
commit 0e2c5647d9203c51edbadc5d1f678862f87198d5
Author: Thomas Huth <thuth@redhat.com>
Date: Thu Feb 26 09:46:03 2026 +0100
tests/functional: Remove the microblazeel test
We are going to remove the microblazeel target, so the test is not
required anymore. The little endian mode is tested already via the
"microblaze" target, so we don't lose any test coverage here.
While we're at it, simplify the "microblaze" target test now (in the
file tests/functional/microblaze/test_s3adsp1800.py) since we don't
need the separate super-class here anymore.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20260226084608.11251-2-thuth@redhat.com>
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index e1f5c0e767..b979cff2b9 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -18,7 +18,6 @@ subdir('i386')
subdir('loongarch64')
subdir('m68k')
subdir('microblaze')
-subdir('microblazeel')
subdir('mips')
subdir('mipsel')
subdir('mips64')
diff --git a/tests/functional/microblaze/test_s3adsp1800.py b/tests/functional/microblaze/test_s3adsp1800.py
index f093b162c0..be78c208e3 100755
--- a/tests/functional/microblaze/test_s3adsp1800.py
+++ b/tests/functional/microblaze/test_s3adsp1800.py
@@ -14,8 +14,6 @@
class MicroblazeMachine(QemuSystemTest):
- timeout = 90
-
ASSET_IMAGE_BE = Asset(
('https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/'
'day17.tar.xz'),
@@ -25,14 +23,12 @@ class MicroblazeMachine(QemuSystemTest):
('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
- def do_ballerina_be_test(self, force_endianness=False):
+ def test_microblaze_s3adsp1800_big_endian(self):
self.set_machine('petalogix-s3adsp1800')
self.archive_extract(self.ASSET_IMAGE_BE)
self.vm.set_console()
self.vm.add_args('-kernel',
self.scratch_file('day17', 'ballerina.bin'))
- if force_endianness:
- self.vm.add_args('-M', 'endianness=big')
self.vm.launch()
wait_for_console_pattern(self, 'This architecture does not have '
'kernel memory protection')
@@ -41,14 +37,13 @@ def do_ballerina_be_test(self, force_endianness=False):
# message, that's why we don't test for a later string here. This
# needs some investigation by a microblaze wizard one day...
- def do_xmaton_le_test(self, force_endianness=False):
+ def test_microblaze_s3adsp1800_little_endian(self):
self.require_netdev('user')
self.set_machine('petalogix-s3adsp1800')
self.archive_extract(self.ASSET_IMAGE_LE)
self.vm.set_console()
self.vm.add_args('-kernel', self.scratch_file('day13', 'xmaton.bin'))
- if force_endianness:
- self.vm.add_args('-M', 'endianness=little')
+ self.vm.add_args('-M', 'endianness=little')
tftproot = self.scratch_file('day13')
self.vm.add_args('-nic', f'user,tftp={tftproot}')
self.vm.launch()
@@ -60,17 +55,5 @@ def do_xmaton_le_test(self, force_endianness=False):
'821cd3cab8efd16ad6ee5acc3642a8ea')
-class MicroblazeBigEndianMachine(MicroblazeMachine):
-
- ASSET_IMAGE_BE = MicroblazeMachine.ASSET_IMAGE_BE
- ASSET_IMAGE_LE = MicroblazeMachine.ASSET_IMAGE_LE
-
- def test_microblaze_s3adsp1800_legacy_be(self):
- self.do_ballerina_be_test()
-
- def test_microblaze_s3adsp1800_legacy_le(self):
- self.do_xmaton_le_test(force_endianness=True)
-
-
if __name__ == '__main__':
QemuSystemTest.main()
diff --git a/tests/functional/microblazeel/meson.build b/tests/functional/microblazeel/meson.build
deleted file mode 100644
index 27619dc5a9..0000000000
--- a/tests/functional/microblazeel/meson.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-tests_microblazeel_system_thorough = [
- 's3adsp1800'
-]
diff --git a/tests/functional/microblazeel/test_s3adsp1800.py b/tests/functional/microblazeel/test_s3adsp1800.py
deleted file mode 100755
index 75ce8856ed..0000000000
--- a/tests/functional/microblazeel/test_s3adsp1800.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-#
-# 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 microblaze.test_s3adsp1800 import MicroblazeMachine
-
-
-class MicroblazeLittleEndianMachine(MicroblazeMachine):
-
- ASSET_IMAGE_LE = MicroblazeMachine.ASSET_IMAGE_LE
- ASSET_IMAGE_BE = MicroblazeMachine.ASSET_IMAGE_BE
-
- def test_microblaze_s3adsp1800_legacy_le(self):
- self.do_xmaton_le_test()
-
- def test_microblaze_s3adsp1800_legacy_be(self):
- self.do_ballerina_be_test(force_endianness=True)
-
-
-if __name__ == '__main__':
- MicroblazeMachine.main()