From: Thomas Huth <thuth@redhat.com>
The opensbi test is used for both, riscv32 and riscv64. Copy the main
test to the riscv64 folder and add a simple wrapper to the riscv32
folder to be able to run it for that target, too.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
MAINTAINERS | 3 ++-
tests/functional/meson.build | 24 ++-----------------
tests/functional/riscv32/meson.build | 10 ++++++++
.../test_migration.py} | 0
tests/functional/riscv32/test_opensbi.py | 10 ++++++++
.../test_tuxrun.py} | 0
tests/functional/riscv64/meson.build | 14 +++++++++++
.../test_migration.py} | 0
.../test_opensbi.py} | 0
.../test_tuxrun.py} | 0
10 files changed, 38 insertions(+), 23 deletions(-)
create mode 100644 tests/functional/riscv32/meson.build
rename tests/functional/{test_riscv32_migration.py => riscv32/test_migration.py} (100%)
create mode 100755 tests/functional/riscv32/test_opensbi.py
rename tests/functional/{test_riscv32_tuxrun.py => riscv32/test_tuxrun.py} (100%)
create mode 100644 tests/functional/riscv64/meson.build
rename tests/functional/{test_riscv64_migration.py => riscv64/test_migration.py} (100%)
rename tests/functional/{test_riscv_opensbi.py => riscv64/test_opensbi.py} (100%)
rename tests/functional/{test_riscv64_tuxrun.py => riscv64/test_tuxrun.py} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 09e31ca1af8..ee26bb82b58 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -331,7 +331,8 @@ F: include/hw/riscv/
F: linux-user/host/riscv32/
F: linux-user/host/riscv64/
F: common-user/host/riscv*
-F: tests/functional/test_riscv*
+F: tests/functional/riscv32
+F: tests/functional/riscv64
F: tests/tcg/riscv64/
RISC-V XThead* extensions
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index cc0e0bc6e0c..2d8f67fd94f 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -26,10 +26,8 @@ subdir('mips64el')
subdir('or1k')
subdir('ppc')
subdir('ppc64')
-
-test_riscv64_timeouts = {
- 'riscv64_tuxrun' : 120,
-}
+subdir('riscv32')
+subdir('riscv64')
test_s390x_timeouts = {
's390x_ccw_virtio' : 420,
@@ -60,24 +58,6 @@ tests_generic_linuxuser = [
tests_generic_bsduser = [
]
-tests_riscv32_system_quick = [
- 'riscv32_migration',
- 'riscv_opensbi',
-]
-
-tests_riscv32_system_thorough = [
- 'riscv32_tuxrun',
-]
-
-tests_riscv64_system_quick = [
- 'riscv64_migration',
- 'riscv_opensbi',
-]
-
-tests_riscv64_system_thorough = [
- 'riscv64_tuxrun',
-]
-
tests_rx_system_thorough = [
'rx_gdbsim',
]
diff --git a/tests/functional/riscv32/meson.build b/tests/functional/riscv32/meson.build
new file mode 100644
index 00000000000..f3ebbb8db5d
--- /dev/null
+++ b/tests/functional/riscv32/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+tests_riscv32_system_quick = [
+ 'migration',
+ 'opensbi',
+]
+
+tests_riscv32_system_thorough = [
+ 'tuxrun',
+]
diff --git a/tests/functional/test_riscv32_migration.py b/tests/functional/riscv32/test_migration.py
similarity index 100%
rename from tests/functional/test_riscv32_migration.py
rename to tests/functional/riscv32/test_migration.py
diff --git a/tests/functional/riscv32/test_opensbi.py b/tests/functional/riscv32/test_opensbi.py
new file mode 100755
index 00000000000..d1ac706f0bb
--- /dev/null
+++ b/tests/functional/riscv32/test_opensbi.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Reuse the 64-bit OpenSBI test for RISC-V 32-bit machines
+
+from riscv64.test_opensbi import RiscvOpenSBI
+
+if __name__ == '__main__':
+ RiscvOpenSBI.main()
diff --git a/tests/functional/test_riscv32_tuxrun.py b/tests/functional/riscv32/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_riscv32_tuxrun.py
rename to tests/functional/riscv32/test_tuxrun.py
diff --git a/tests/functional/riscv64/meson.build b/tests/functional/riscv64/meson.build
new file mode 100644
index 00000000000..2bdd6b408e8
--- /dev/null
+++ b/tests/functional/riscv64/meson.build
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+test_riscv64_timeouts = {
+ 'tuxrun' : 120,
+}
+
+tests_riscv64_system_quick = [
+ 'migration',
+ 'opensbi',
+]
+
+tests_riscv64_system_thorough = [
+ 'tuxrun',
+]
diff --git a/tests/functional/test_riscv64_migration.py b/tests/functional/riscv64/test_migration.py
similarity index 100%
rename from tests/functional/test_riscv64_migration.py
rename to tests/functional/riscv64/test_migration.py
diff --git a/tests/functional/test_riscv_opensbi.py b/tests/functional/riscv64/test_opensbi.py
similarity index 100%
rename from tests/functional/test_riscv_opensbi.py
rename to tests/functional/riscv64/test_opensbi.py
diff --git a/tests/functional/test_riscv64_tuxrun.py b/tests/functional/riscv64/test_tuxrun.py
similarity index 100%
rename from tests/functional/test_riscv64_tuxrun.py
rename to tests/functional/riscv64/test_tuxrun.py
--
2.50.1