On 1/8/25 17:12, Thomas Huth wrote:
From: Thomas Huth <th...@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 <th...@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/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')
Here again I'd merge in a single 'riscv/' directory. Anyhow,
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
