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>
Thomas Huth committed
Feb 26, 2026 at 09:46 UTC
0e2c5647d9203c51edbadc5d1f678862f87198d5
4 files changed
+3
-52
tests/functional/meson.build
-1
@@ -18,7 +18,6 @@ subdir('i386')
18
subdir('loongarch64')
19
subdir('m68k')
20
subdir('microblaze')
21
-subdir('microblazeel')
21
subdir('mips')
22
subdir('mipsel')
23
subdir('mips64')
tests/functional/microblaze/test_s3adsp1800.py
+3
-20
@@ -14,8 +14,6 @@ from qemu_test import wait_for_console_pattern
14
15
class MicroblazeMachine(QemuSystemTest):
16
17
- timeout = 90
18
-
17
ASSET_IMAGE_BE = Asset(
18
('https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/'
19
'day17.tar.xz'),
@@ -25,14 +23,12 @@ class MicroblazeMachine(QemuSystemTest):
23
('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
24
'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
25
28
- def do_ballerina_be_test(self, force_endianness=False):
26
+ def test_microblaze_s3adsp1800_big_endian(self):
27
self.set_machine('petalogix-s3adsp1800')
28
self.archive_extract(self.ASSET_IMAGE_BE)
29
self.vm.set_console()
30
self.vm.add_args('-kernel',
31
self.scratch_file('day17', 'ballerina.bin'))
34
- if force_endianness:
35
- self.vm.add_args('-M', 'endianness=big')
32
self.vm.launch()
33
wait_for_console_pattern(self, 'This architecture does not have '
34
'kernel memory protection')
@@ -41,14 +37,13 @@ class MicroblazeMachine(QemuSystemTest):
37
# message, that's why we don't test for a later string here. This
38
# needs some investigation by a microblaze wizard one day...
39
44
- def do_xmaton_le_test(self, force_endianness=False):
40
+ def test_microblaze_s3adsp1800_little_endian(self):
41
self.require_netdev('user')
42
self.set_machine('petalogix-s3adsp1800')
43
self.archive_extract(self.ASSET_IMAGE_LE)
44
self.vm.set_console()
45
self.vm.add_args('-kernel', self.scratch_file('day13', 'xmaton.bin'))
50
- if force_endianness:
51
- self.vm.add_args('-M', 'endianness=little')
46
+ self.vm.add_args('-M', 'endianness=little')
47
tftproot = self.scratch_file('day13')
48
self.vm.add_args('-nic', f'user,tftp={tftproot}')
49
self.vm.launch()
@@ -60,17 +55,5 @@ class MicroblazeMachine(QemuSystemTest):
55
'821cd3cab8efd16ad6ee5acc3642a8ea')
56
57
63
-class MicroblazeBigEndianMachine(MicroblazeMachine):
64
-
65
- ASSET_IMAGE_BE = MicroblazeMachine.ASSET_IMAGE_BE
66
- ASSET_IMAGE_LE = MicroblazeMachine.ASSET_IMAGE_LE
67
-
68
- def test_microblaze_s3adsp1800_legacy_be(self):
69
- self.do_ballerina_be_test()
70
-
71
- def test_microblaze_s3adsp1800_legacy_le(self):
72
- self.do_xmaton_le_test(force_endianness=True)
73
-
74
-
58
if __name__ == '__main__':
59
QemuSystemTest.main()
tests/functional/microblazeel/meson.build
deleted
-5
@@ -1,5 +0,0 @@
1
-# SPDX-License-Identifier: GPL-2.0-or-later
2
-
3
-tests_microblazeel_system_thorough = [
4
- 's3adsp1800'
5
-]
tests/functional/microblazeel/test_s3adsp1800.py
deleted
-26
@@ -1,26 +0,0 @@
1
-#!/usr/bin/env python3
2
-#
3
-# Functional test that boots a microblaze Linux kernel and checks the console
4
-#
5
-# Copyright (c) 2018, 2021 Red Hat, Inc.
6
-#
7
-# This work is licensed under the terms of the GNU GPL, version 2 or
8
-# later. See the COPYING file in the top-level directory.
9
-
10
-from microblaze.test_s3adsp1800 import MicroblazeMachine
11
-
12
-
13
-class MicroblazeLittleEndianMachine(MicroblazeMachine):
14
-
15
- ASSET_IMAGE_LE = MicroblazeMachine.ASSET_IMAGE_LE
16
- ASSET_IMAGE_BE = MicroblazeMachine.ASSET_IMAGE_BE
17
-
18
- def test_microblaze_s3adsp1800_legacy_le(self):
19
- self.do_xmaton_le_test()
20
-
21
- def test_microblaze_s3adsp1800_legacy_be(self):
22
- self.do_ballerina_be_test(force_endianness=True)
23
-
24
-
25
-if __name__ == '__main__':
26
- MicroblazeMachine.main()