aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Le Goater <clg@redhat.com>2024-12-06 14:11:31 +0100
committerCédric Le Goater <clg@redhat.com>2024-12-11 07:25:53 +0100
commit38cd5c5235cb3bdca5a45f4b7fb4bf3d1c0ad3ca (patch)
tree9bf614a284598d7336472a9c4a7a5ab6b2d4a762
parentc7bc9cab3f5e2c0f807d801d09d0bbe95c4ce825 (diff)
downloadqemu-38cd5c5235cb3bdca5a45f4b7fb4bf3d1c0ad3ca.zip
qemu-38cd5c5235cb3bdca5a45f4b7fb4bf3d1c0ad3ca.tar.gz
qemu-38cd5c5235cb3bdca5a45f4b7fb4bf3d1c0ad3ca.tar.bz2
tests/functional: Introduce a specific test for rainier-bmc machine
This simply moves the rainier-bmc test to a new test file. No changes in the test. The test_arm_aspeed.py is deleted. Reviewed-by: Thomas Huth <thuth@redhat.com> Link: https://lore.kernel.org/r/20241206131132.520911-7-clg@redhat.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
-rw-r--r--tests/functional/meson.build4
-rw-r--r--[-rwxr-xr-x]tests/functional/test_arm_aspeed_rainier.py (renamed from tests/functional/test_arm_aspeed.py)22
2 files changed, 7 insertions, 19 deletions
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index b5fd3be..96f2291 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -22,7 +22,7 @@ test_timeouts = {
'arm_aspeed_romulus' : 120,
'arm_aspeed_ast2500' : 480,
'arm_aspeed_ast2600' : 720,
- 'arm_aspeed' : 600,
+ 'arm_aspeed_rainier' : 240,
'arm_bpim2u' : 500,
'arm_collie' : 180,
'arm_orangepi' : 540,
@@ -69,12 +69,12 @@ tests_alpha_system_thorough = [
]
tests_arm_system_thorough = [
- 'arm_aspeed',
'arm_aspeed_ast1030',
'arm_aspeed_palmetto',
'arm_aspeed_romulus',
'arm_aspeed_ast2500',
'arm_aspeed_ast2600',
+ 'arm_aspeed_rainier',
'arm_bpim2u',
'arm_canona1100',
'arm_collie',
diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed_rainier.py
index 8cf8679..a602749 100755..100644
--- a/tests/functional/test_arm_aspeed.py
+++ b/tests/functional/test_arm_aspeed_rainier.py
@@ -1,25 +1,13 @@
#!/usr/bin/env python3
#
-# Functional test that boots the ASPEED SoCs with firmware
-#
-# Copyright (C) 2022 ASPEED Technology Inc
+# Functional test that boots the ASPEED machines
#
# SPDX-License-Identifier: GPL-2.0-or-later
-import os
-import time
-import subprocess
-import tempfile
-
-from qemu_test import LinuxKernelTest, Asset
-from qemu_test import exec_command_and_wait_for_pattern
-from qemu_test import interrupt_interactive_console_until_pattern
-from qemu_test import has_cmd
-from qemu_test.utils import archive_extract
-from zipfile import ZipFile
-from unittest import skipUnless
+from qemu_test import Asset
+from aspeed import AspeedTest
-class AST2x00MachineMMC(LinuxKernelTest):
+class RainierMachine(AspeedTest):
ASSET_RAINIER_EMMC = Asset(
('https://fileserver.linaro.org/s/B6pJTwWEkzSDi36/download/'
@@ -49,4 +37,4 @@ class AST2x00MachineMMC(LinuxKernelTest):
self.wait_for_console_pattern('IBM eBMC (OpenBMC for IBM Enterprise')
if __name__ == '__main__':
- LinuxKernelTest.main()
+ AspeedTest.main()