From: Thomas Huth <thuth@redhat.com>
The tests/functional folder has become quite crowded, thus move the
mips tests into a target-specific subfolder.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
MAINTAINERS | 8 ++--
tests/functional/meson.build | 47 ++-----------------
tests/functional/mips/meson.build | 11 +++++
.../test_malta.py} | 0
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/mips64/meson.build | 10 ++++
.../test_malta.py} | 2 +-
.../test_tuxrun.py} | 0
tests/functional/mips64el/meson.build | 14 ++++++
.../test_fuloong2e.py} | 0
.../test_loongson3v.py} | 0
.../test_malta.py} | 4 +-
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
tests/functional/mipsel/meson.build | 12 +++++
.../test_malta.py} | 2 +-
.../test_replay.py} | 0
.../test_tuxrun.py} | 0
19 files changed, 59 insertions(+), 51 deletions(-)
create mode 100644 tests/functional/mips/meson.build
rename tests/functional/{test_mips_malta.py => mips/test_malta.py} (100%)
rename tests/functional/{test_mips_replay.py => mips/test_replay.py} (100%)
rename tests/functional/{test_mips_tuxrun.py => mips/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64/meson.build
rename tests/functional/{test_mips64_malta.py => mips64/test_malta.py} (96%)
rename tests/functional/{test_mips64_tuxrun.py => mips64/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mips64el/meson.build
rename tests/functional/{test_mips64el_fuloong2e.py => mips64el/test_fuloong2e.py} (100%)
rename tests/functional/{test_mips64el_loongson3v.py => mips64el/test_loongson3v.py} (100%)
rename tests/functional/{test_mips64el_malta.py => mips64el/test_malta.py} (98%)
rename tests/functional/{test_mips64el_replay.py => mips64el/test_replay.py} (100%)
rename tests/functional/{test_mips64el_tuxrun.py => mips64el/test_tuxrun.py} (100%)
create mode 100644 tests/functional/mipsel/meson.build
rename tests/functional/{test_mipsel_malta.py => mipsel/test_malta.py} (98%)
rename tests/functional/{test_mipsel_replay.py => mipsel/test_replay.py} (100%)
mode change 100644 => 100755
rename tests/functional/{test_mipsel_tuxrun.py => mipsel/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7e2080faa5c..56e430db153 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1403,8 +1403,8 @@ F: hw/acpi/piix4.c
F: hw/mips/malta.c
F: hw/pci-host/gt64120.c
F: include/hw/southbridge/piix.h
-F: tests/functional/test_mips*_malta.py
-F: tests/functional/test_mips*_tuxrun.py
+F: tests/functional/mips*/test_malta.py
+F: tests/functional/mips*/test_tuxrun.py
Mipssim
R: Aleksandar Rikalo <arikalo@gmail.com>
@@ -1420,7 +1420,7 @@ S: Odd Fixes
F: hw/mips/fuloong2e.c
F: hw/pci-host/bonito.c
F: include/hw/pci-host/bonito.h
-F: tests/functional/test_mips64el_fuloong2e.py
+F: tests/functional/mips64el/test_fuloong2e.py
Loongson-3 virtual platforms
M: Huacai Chen <chenhuacai@kernel.org>
@@ -1435,7 +1435,7 @@ F: hw/mips/loongson3_virt.c
F: include/hw/intc/loongson_ipi_common.h
F: include/hw/intc/loongson_ipi.h
F: include/hw/intc/loongson_liointc.h
-F: tests/functional/test_mips64el_loongson3v.py
+F: tests/functional/mips64el/test_loongson3v.py
Boston
M: Paul Burton <paulburton@kernel.org>
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index fc15c261f7b..586f3dc6cac 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -19,24 +19,10 @@ subdir('loongarch64')
subdir('m68k')
subdir('microblaze')
subdir('microblazeel')
-
-test_mips_timeouts = {
- 'mips_malta' : 480,
-}
-
-test_mipsel_timeouts = {
- 'mipsel_malta' : 420,
- 'mipsel_replay' : 480,
-}
-
-test_mips64_timeouts = {
- 'mips64_malta' : 240,
-}
-
-test_mips64el_timeouts = {
- 'mips64el_malta' : 420,
- 'mips64el_replay' : 180,
-}
+subdir('mips')
+subdir('mipsel')
+subdir('mips64')
+subdir('mips64el')
test_ppc_timeouts = {
'ppc_40p' : 240,
@@ -84,31 +70,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_mips_system_thorough = [
- 'mips_malta',
- 'mips_replay',
- 'mips_tuxrun',
-]
-
-tests_mipsel_system_thorough = [
- 'mipsel_malta',
- 'mipsel_replay',
- 'mipsel_tuxrun',
-]
-
-tests_mips64_system_thorough = [
- 'mips64_malta',
- 'mips64_tuxrun',
-]
-
-tests_mips64el_system_thorough = [
- 'mips64el_fuloong2e',
- 'mips64el_loongson3v',
- 'mips64el_malta',
- 'mips64el_replay',
- 'mips64el_tuxrun',
-]
-
tests_or1k_system_thorough = [
'or1k_replay',
'or1k_sim',
diff --git a/tests/functional/mips/meson.build b/tests/functional/mips/meson.build
new file mode 100644
index 00000000000..49aaf53b02d
--- /dev/null
+++ b/tests/functional/mips/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_mips_timeouts = {
+ 'malta' : 480,
+}
+
+tests_mips_system_thorough = [
+ 'malta',
+ 'replay',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_mips_malta.py b/tests/functional/mips/test_malta.py
similarity index 100%
rename from tests/functional/test_mips_malta.py
rename to tests/functional/mips/test_malta.py
diff --git a/tests/functional/test_mips_replay.py b/tests/functional/mips/test_replay.py
similarity index 100%
rename from tests/functional/test_mips_replay.py
rename to tests/functional/mips/test_replay.py
diff --git a/tests/functional/test_mips_tuxrun.py b/tests/functional/mips/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_mips_tuxrun.py
rename to tests/functional/mips/test_tuxrun.py
diff --git a/tests/functional/mips64/meson.build b/tests/functional/mips64/meson.build
new file mode 100644
index 00000000000..3ff21189879
--- /dev/null
+++ b/tests/functional/mips64/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_mips64_timeouts = {
+ 'malta' : 240,
+}
+
+tests_mips64_system_thorough = [
+ 'malta',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_mips64_malta.py b/tests/functional/mips64/test_malta.py
similarity index 96%
rename from tests/functional/test_mips64_malta.py
rename to tests/functional/mips64/test_malta.py
index 53c3e0c1221..a553d3c5bc7 100755
--- a/tests/functional/test_mips64_malta.py
+++ b/tests/functional/mips64/test_malta.py
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
from qemu_test import LinuxKernelTest, Asset
-from test_mips_malta import mips_check_wheezy
+from mips.test_malta import mips_check_wheezy
class MaltaMachineConsole(LinuxKernelTest):
diff --git a/tests/functional/test_mips64_tuxrun.py b/tests/functional/mips64/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_mips64_tuxrun.py
rename to tests/functional/mips64/test_tuxrun.py
diff --git a/tests/functional/mips64el/meson.build b/tests/functional/mips64el/meson.build
new file mode 100644
index 00000000000..69ec50174c4
--- /dev/null
+++ b/tests/functional/mips64el/meson.build
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_mips64el_timeouts = {
+ 'malta' : 420,
+ 'replay' : 180,
+}
+
+tests_mips64el_system_thorough = [
+ 'fuloong2e',
+ 'loongson3v',
+ 'malta',
+ 'replay',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_mips64el_fuloong2e.py b/tests/functional/mips64el/test_fuloong2e.py
similarity index 100%
rename from tests/functional/test_mips64el_fuloong2e.py
rename to tests/functional/mips64el/test_fuloong2e.py
diff --git a/tests/functional/test_mips64el_loongson3v.py b/tests/functional/mips64el/test_loongson3v.py
similarity index 100%
rename from tests/functional/test_mips64el_loongson3v.py
rename to tests/functional/mips64el/test_loongson3v.py
diff --git a/tests/functional/test_mips64el_malta.py b/tests/functional/mips64el/test_malta.py
similarity index 98%
rename from tests/functional/test_mips64el_malta.py
rename to tests/functional/mips64el/test_malta.py
index 3cc79b74c18..8fdc49b3005 100755
--- a/tests/functional/test_mips64el_malta.py
+++ b/tests/functional/mips64el/test_malta.py
@@ -16,7 +16,7 @@
from qemu_test import exec_command_and_wait_for_pattern
from qemu_test import skipIfMissingImports, skipFlakyTest, skipUntrustedTest
-from test_mips_malta import mips_check_wheezy
+from mips.test_malta import mips_check_wheezy
class MaltaMachineConsole(LinuxKernelTest):
@@ -191,7 +191,7 @@ def test_mips_malta_i6400_framebuffer_logo_8cores(self):
self.do_test_i6400_framebuffer_logo(8)
-from test_mipsel_malta import MaltaMachineYAMON
+from mipsel.test_malta import MaltaMachineYAMON
if __name__ == '__main__':
LinuxKernelTest.main()
diff --git a/tests/functional/test_mips64el_replay.py b/tests/functional/mips64el/test_replay.py
similarity index 100%
rename from tests/functional/test_mips64el_replay.py
rename to tests/functional/mips64el/test_replay.py
diff --git a/tests/functional/test_mips64el_tuxrun.py b/tests/functional/mips64el/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_mips64el_tuxrun.py
rename to tests/functional/mips64el/test_tuxrun.py
diff --git a/tests/functional/mipsel/meson.build b/tests/functional/mipsel/meson.build
new file mode 100644
index 00000000000..8bfdf0649b5
--- /dev/null
+++ b/tests/functional/mipsel/meson.build
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_mipsel_timeouts = {
+ 'malta' : 420,
+ 'replay' : 480,
+}
+
+tests_mipsel_system_thorough = [
+ 'malta',
+ 'replay',
+ 'tuxrun',
+]
diff --git a/tests/functional/test_mipsel_malta.py b/tests/functional/mipsel/test_malta.py
similarity index 98%
rename from tests/functional/test_mipsel_malta.py
rename to tests/functional/mipsel/test_malta.py
index 9ee2884da8e..427e163d19d 100755
--- a/tests/functional/test_mipsel_malta.py
+++ b/tests/functional/mipsel/test_malta.py
@@ -13,7 +13,7 @@
from qemu_test import interrupt_interactive_console_until_pattern
from qemu_test import wait_for_console_pattern
-from test_mips_malta import mips_check_wheezy
+from mips.test_malta import mips_check_wheezy
class MaltaMachineConsole(LinuxKernelTest):
diff --git a/tests/functional/test_mipsel_replay.py b/tests/functional/mipsel/test_replay.py
old mode 100644
new mode 100755
similarity index 100%
rename from tests/functional/test_mipsel_replay.py
rename to tests/functional/mipsel/test_replay.py
diff --git a/tests/functional/test_mipsel_tuxrun.py b/tests/functional/mipsel/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_mipsel_tuxrun.py
rename to tests/functional/mipsel/test_tuxrun.py
--
2.50.1Hi Thomas,
On 1/8/25 17:12, Thomas Huth wrote:
> From: Thomas Huth <thuth@redhat.com>
>
> The tests/functional folder has become quite crowded, thus move the
> mips tests into a target-specific subfolder.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> MAINTAINERS | 8 ++--
> tests/functional/meson.build | 47 ++-----------------
> tests/functional/mips/meson.build | 11 +++++
> .../test_malta.py} | 0
> .../test_replay.py} | 0
> .../test_tuxrun.py} | 0
> tests/functional/mips64/meson.build | 10 ++++
> .../test_malta.py} | 2 +-
> .../test_tuxrun.py} | 0
> tests/functional/mips64el/meson.build | 14 ++++++
> .../test_fuloong2e.py} | 0
> .../test_loongson3v.py} | 0
> .../test_malta.py} | 4 +-
> .../test_replay.py} | 0
> .../test_tuxrun.py} | 0
> tests/functional/mipsel/meson.build | 12 +++++
> .../test_malta.py} | 2 +-
> .../test_replay.py} | 0
> .../test_tuxrun.py} | 0
> 19 files changed, 59 insertions(+), 51 deletions(-)
> create mode 100644 tests/functional/mips/meson.build
> rename tests/functional/{test_mips_malta.py => mips/test_malta.py} (100%)
> rename tests/functional/{test_mips_replay.py => mips/test_replay.py} (100%)
> rename tests/functional/{test_mips_tuxrun.py => mips/test_tuxrun.py} (100%)
> create mode 100644 tests/functional/mips64/meson.build
> rename tests/functional/{test_mips64_malta.py => mips64/test_malta.py} (96%)
> rename tests/functional/{test_mips64_tuxrun.py => mips64/test_tuxrun.py} (100%)
> create mode 100644 tests/functional/mips64el/meson.build
> rename tests/functional/{test_mips64el_fuloong2e.py => mips64el/test_fuloong2e.py} (100%)
> rename tests/functional/{test_mips64el_loongson3v.py => mips64el/test_loongson3v.py} (100%)
> rename tests/functional/{test_mips64el_malta.py => mips64el/test_malta.py} (98%)
> rename tests/functional/{test_mips64el_replay.py => mips64el/test_replay.py} (100%)
> rename tests/functional/{test_mips64el_tuxrun.py => mips64el/test_tuxrun.py} (100%)
> create mode 100644 tests/functional/mipsel/meson.build
> rename tests/functional/{test_mipsel_malta.py => mipsel/test_malta.py} (98%)
> rename tests/functional/{test_mipsel_replay.py => mipsel/test_replay.py} (100%)
> mode change 100644 => 100755
> rename tests/functional/{test_mipsel_tuxrun.py => mipsel/test_tuxrun.py} (100%)
> +subdir('mips')
> +subdir('mipsel')
> +subdir('mips64')
> +subdir('mips64el')
Just one single comment here. I'd rather have a single mips/ directory
and keep the variants inside it, i.e.:
tests/functional/mips/test_mips64el_malta.py
Anyhow:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 04/08/2025 10.31, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 1/8/25 17:12, Thomas Huth wrote:
>> From: Thomas Huth <thuth@redhat.com>
>>
>> The tests/functional folder has become quite crowded, thus move the
>> mips tests into a target-specific subfolder.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> MAINTAINERS | 8 ++--
>> tests/functional/meson.build | 47 ++-----------------
>> tests/functional/mips/meson.build | 11 +++++
>> .../test_malta.py} | 0
>> .../test_replay.py} | 0
>> .../test_tuxrun.py} | 0
>> tests/functional/mips64/meson.build | 10 ++++
>> .../test_malta.py} | 2 +-
>> .../test_tuxrun.py} | 0
>> tests/functional/mips64el/meson.build | 14 ++++++
>> .../test_fuloong2e.py} | 0
>> .../test_loongson3v.py} | 0
>> .../test_malta.py} | 4 +-
>> .../test_replay.py} | 0
>> .../test_tuxrun.py} | 0
>> tests/functional/mipsel/meson.build | 12 +++++
>> .../test_malta.py} | 2 +-
>> .../test_replay.py} | 0
>> .../test_tuxrun.py} | 0
>> 19 files changed, 59 insertions(+), 51 deletions(-)
>> create mode 100644 tests/functional/mips/meson.build
>> rename tests/functional/{test_mips_malta.py => mips/test_malta.py} (100%)
>> rename tests/functional/{test_mips_replay.py => mips/test_replay.py} (100%)
>> rename tests/functional/{test_mips_tuxrun.py => mips/test_tuxrun.py} (100%)
>> create mode 100644 tests/functional/mips64/meson.build
>> rename tests/functional/{test_mips64_malta.py => mips64/test_malta.py}
>> (96%)
>> rename tests/functional/{test_mips64_tuxrun.py => mips64/test_tuxrun.py}
>> (100%)
>> create mode 100644 tests/functional/mips64el/meson.build
>> rename tests/functional/{test_mips64el_fuloong2e.py => mips64el/
>> test_fuloong2e.py} (100%)
>> rename tests/functional/{test_mips64el_loongson3v.py => mips64el/
>> test_loongson3v.py} (100%)
>> rename tests/functional/{test_mips64el_malta.py => mips64el/
>> test_malta.py} (98%)
>> rename tests/functional/{test_mips64el_replay.py => mips64el/
>> test_replay.py} (100%)
>> rename tests/functional/{test_mips64el_tuxrun.py => mips64el/
>> test_tuxrun.py} (100%)
>> create mode 100644 tests/functional/mipsel/meson.build
>> rename tests/functional/{test_mipsel_malta.py => mipsel/test_malta.py}
>> (98%)
>> rename tests/functional/{test_mipsel_replay.py => mipsel/test_replay.py}
>> (100%)
>> mode change 100644 => 100755
>> rename tests/functional/{test_mipsel_tuxrun.py => mipsel/test_tuxrun.py}
>> (100%)
>
>
>> +subdir('mips')
>> +subdir('mipsel')
>> +subdir('mips64')
>> +subdir('mips64el')
>
> Just one single comment here. I'd rather have a single mips/ directory
> and keep the variants inside it, i.e.:
>
> tests/functional/mips/test_mips64el_malta.py
That would make it very cumbersome to determine which qemu-system-mips*
binary we'd need for those tests. Currently the tests for each
qemu-system-xyz are simply looked up in the xyz subfolder. If we put all
mips targets into one folder, we'd need to add some special case logic which
I'd really like to avoid.
And in case the mips targets get unified later, we still can simply move the
tests to one folder again, there is no hurry to do this right now already.
Thomas
On 5/8/25 15:56, Thomas Huth wrote:
> On 04/08/2025 10.31, Philippe Mathieu-Daudé wrote:
>> Hi Thomas,
>>
>> On 1/8/25 17:12, Thomas Huth wrote:
>>> From: Thomas Huth <thuth@redhat.com>
>>>
>>> The tests/functional folder has become quite crowded, thus move the
>>> mips tests into a target-specific subfolder.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>> MAINTAINERS | 8 ++--
>>> tests/functional/meson.build | 47 ++-----------------
>>> tests/functional/mips/meson.build | 11 +++++
>>> .../test_malta.py} | 0
>>> .../test_replay.py} | 0
>>> .../test_tuxrun.py} | 0
>>> tests/functional/mips64/meson.build | 10 ++++
>>> .../test_malta.py} | 2 +-
>>> .../test_tuxrun.py} | 0
>>> tests/functional/mips64el/meson.build | 14 ++++++
>>> .../test_fuloong2e.py} | 0
>>> .../test_loongson3v.py} | 0
>>> .../test_malta.py} | 4 +-
>>> .../test_replay.py} | 0
>>> .../test_tuxrun.py} | 0
>>> tests/functional/mipsel/meson.build | 12 +++++
>>> .../test_malta.py} | 2 +-
>>> .../test_replay.py} | 0
>>> .../test_tuxrun.py} | 0
>>> 19 files changed, 59 insertions(+), 51 deletions(-)
>>> create mode 100644 tests/functional/mips/meson.build
>>> rename tests/functional/{test_mips_malta.py => mips/test_malta.py}
>>> (100%)
>>> rename tests/functional/{test_mips_replay.py => mips/
>>> test_replay.py} (100%)
>>> rename tests/functional/{test_mips_tuxrun.py => mips/
>>> test_tuxrun.py} (100%)
>>> create mode 100644 tests/functional/mips64/meson.build
>>> rename tests/functional/{test_mips64_malta.py => mips64/
>>> test_malta.py} (96%)
>>> rename tests/functional/{test_mips64_tuxrun.py => mips64/
>>> test_tuxrun.py} (100%)
>>> create mode 100644 tests/functional/mips64el/meson.build
>>> rename tests/functional/{test_mips64el_fuloong2e.py => mips64el/
>>> test_fuloong2e.py} (100%)
>>> rename tests/functional/{test_mips64el_loongson3v.py => mips64el/
>>> test_loongson3v.py} (100%)
>>> rename tests/functional/{test_mips64el_malta.py => mips64el/
>>> test_malta.py} (98%)
>>> rename tests/functional/{test_mips64el_replay.py => mips64el/
>>> test_replay.py} (100%)
>>> rename tests/functional/{test_mips64el_tuxrun.py => mips64el/
>>> test_tuxrun.py} (100%)
>>> create mode 100644 tests/functional/mipsel/meson.build
>>> rename tests/functional/{test_mipsel_malta.py => mipsel/
>>> test_malta.py} (98%)
>>> rename tests/functional/{test_mipsel_replay.py => mipsel/
>>> test_replay.py} (100%)
>>> mode change 100644 => 100755
>>> rename tests/functional/{test_mipsel_tuxrun.py => mipsel/
>>> test_tuxrun.py} (100%)
>>
>>
>>> +subdir('mips')
>>> +subdir('mipsel')
>>> +subdir('mips64')
>>> +subdir('mips64el')
>>
>> Just one single comment here. I'd rather have a single mips/ directory
>> and keep the variants inside it, i.e.:
>>
>> tests/functional/mips/test_mips64el_malta.py
>
> That would make it very cumbersome to determine which qemu-system-mips*
> binary we'd need for those tests. Currently the tests for each qemu-
> system-xyz are simply looked up in the xyz subfolder. If we put all mips
> targets into one folder, we'd need to add some special case logic which
> I'd really like to avoid.
> And in case the mips targets get unified later, we still can simply move
> the tests to one folder again, there is no hurry to do this right now
> already.
Alright, fine then.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
© 2016 - 2025 Red Hat, Inc.