* [PATCH 1/7] tests/functional: Introduce a specific test for ast1030 SoC
2024-12-06 13:11 [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
@ 2024-12-06 13:11 ` Cédric Le Goater
2024-12-06 13:48 ` Thomas Huth
2024-12-06 13:11 ` [PATCH 2/7] tests/functional: Introduce a specific test for palmetto-bmc machine Cédric Le Goater
` (6 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Cédric Le Goater @ 2024-12-06 13:11 UTC (permalink / raw)
To: qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Thomas Huth, Philippe Mathieu-Daudé,
Cédric Le Goater
This simply moves the ast1030 tests to a new test file. No changes.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
tests/functional/meson.build | 2 +
tests/functional/test_arm_aspeed.py | 64 ----------------
tests/functional/test_arm_aspeed_ast1030.py | 81 +++++++++++++++++++++
3 files changed, 83 insertions(+), 64 deletions(-)
create mode 100644 tests/functional/test_arm_aspeed_ast1030.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index d6d2c0196c76..ef593d4b9928 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -18,6 +18,7 @@ test_timeouts = {
'aarch64_tuxrun' : 240,
'aarch64_virt' : 720,
'acpi_bits' : 420,
+ 'arm_aspeed_ast1030' : 10,
'arm_aspeed' : 600,
'arm_bpim2u' : 500,
'arm_collie' : 180,
@@ -66,6 +67,7 @@ tests_alpha_system_thorough = [
tests_arm_system_thorough = [
'arm_aspeed',
+ 'arm_aspeed_ast1030',
'arm_bpim2u',
'arm_canona1100',
'arm_collie',
diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
index d88170ac2415..9e58fcd84009 100755
--- a/tests/functional/test_arm_aspeed.py
+++ b/tests/functional/test_arm_aspeed.py
@@ -19,70 +19,6 @@
from zipfile import ZipFile
from unittest import skipUnless
-class AST1030Machine(LinuxKernelTest):
-
- ASSET_ZEPHYR_1_04 = Asset(
- ('https://github.com/AspeedTech-BMC'
- '/zephyr/releases/download/v00.01.04/ast1030-evb-demo.zip'),
- '4ac6210adcbc61294927918707c6762483fd844dde5e07f3ba834ad1f91434d3')
-
- def test_ast1030_zephyros_1_04(self):
- self.set_machine('ast1030-evb')
-
- zip_file = self.ASSET_ZEPHYR_1_04.fetch()
-
- kernel_name = "ast1030-evb-demo/zephyr.elf"
- with ZipFile(zip_file, 'r') as zf:
- zf.extract(kernel_name, path=self.workdir)
- kernel_file = os.path.join(self.workdir, kernel_name)
-
- self.vm.set_console()
- self.vm.add_args('-kernel', kernel_file, '-nographic')
- self.vm.launch()
- self.wait_for_console_pattern("Booting Zephyr OS")
- exec_command_and_wait_for_pattern(self, "help",
- "Available commands")
-
- ASSET_ZEPHYR_1_07 = Asset(
- ('https://github.com/AspeedTech-BMC'
- '/zephyr/releases/download/v00.01.07/ast1030-evb-demo.zip'),
- 'ad52e27959746988afaed8429bf4e12ab988c05c4d07c9d90e13ec6f7be4574c')
-
- def test_ast1030_zephyros_1_07(self):
- self.set_machine('ast1030-evb')
-
- zip_file = self.ASSET_ZEPHYR_1_07.fetch()
-
- kernel_name = "ast1030-evb-demo/zephyr.bin"
- with ZipFile(zip_file, 'r') as zf:
- zf.extract(kernel_name, path=self.workdir)
- kernel_file = os.path.join(self.workdir, kernel_name)
-
- self.vm.set_console()
- self.vm.add_args('-kernel', kernel_file, '-nographic')
- self.vm.launch()
- self.wait_for_console_pattern("Booting Zephyr OS")
- for shell_cmd in [
- 'kernel stacks',
- 'otp info conf',
- 'otp info scu',
- 'hwinfo devid',
- 'crypto aes256_cbc_vault',
- 'random get',
- 'jtag JTAG1 sw_xfer high TMS',
- 'adc ADC0 resolution 12',
- 'adc ADC0 read 42',
- 'adc ADC1 read 69',
- 'i2c scan I2C_0',
- 'i3c attach I3C_0',
- 'hash test',
- 'kernel uptime',
- 'kernel reboot warm',
- 'kernel uptime',
- 'kernel reboot cold',
- 'kernel uptime',
- ]: exec_command_and_wait_for_pattern(self, shell_cmd, "uart:~$")
-
class AST2x00Machine(LinuxKernelTest):
def do_test_arm_aspeed(self, machine, image):
diff --git a/tests/functional/test_arm_aspeed_ast1030.py b/tests/functional/test_arm_aspeed_ast1030.py
new file mode 100644
index 000000000000..380a76ec015c
--- /dev/null
+++ b/tests/functional/test_arm_aspeed_ast1030.py
@@ -0,0 +1,81 @@
+#!/usr/bin/env python3
+#
+# Functional test that boots the ASPEED SoCs with firmware
+#
+# Copyright (C) 2022 ASPEED Technology Inc
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import os
+
+from qemu_test import LinuxKernelTest, Asset
+from qemu_test import exec_command_and_wait_for_pattern
+from zipfile import ZipFile
+
+class AST1030Machine(LinuxKernelTest):
+
+ ASSET_ZEPHYR_1_04 = Asset(
+ ('https://github.com/AspeedTech-BMC'
+ '/zephyr/releases/download/v00.01.04/ast1030-evb-demo.zip'),
+ '4ac6210adcbc61294927918707c6762483fd844dde5e07f3ba834ad1f91434d3')
+
+ def test_ast1030_zephyros_1_04(self):
+ self.set_machine('ast1030-evb')
+
+ zip_file = self.ASSET_ZEPHYR_1_04.fetch()
+
+ kernel_name = "ast1030-evb-demo/zephyr.elf"
+ with ZipFile(zip_file, 'r') as zf:
+ zf.extract(kernel_name, path=self.workdir)
+ kernel_file = os.path.join(self.workdir, kernel_name)
+
+ self.vm.set_console()
+ self.vm.add_args('-kernel', kernel_file, '-nographic')
+ self.vm.launch()
+ self.wait_for_console_pattern("Booting Zephyr OS")
+ exec_command_and_wait_for_pattern(self, "help",
+ "Available commands")
+
+ ASSET_ZEPHYR_1_07 = Asset(
+ ('https://github.com/AspeedTech-BMC'
+ '/zephyr/releases/download/v00.01.07/ast1030-evb-demo.zip'),
+ 'ad52e27959746988afaed8429bf4e12ab988c05c4d07c9d90e13ec6f7be4574c')
+
+ def test_ast1030_zephyros_1_07(self):
+ self.set_machine('ast1030-evb')
+
+ zip_file = self.ASSET_ZEPHYR_1_07.fetch()
+
+ kernel_name = "ast1030-evb-demo/zephyr.bin"
+ with ZipFile(zip_file, 'r') as zf:
+ zf.extract(kernel_name, path=self.workdir)
+ kernel_file = os.path.join(self.workdir, kernel_name)
+
+ self.vm.set_console()
+ self.vm.add_args('-kernel', kernel_file, '-nographic')
+ self.vm.launch()
+ self.wait_for_console_pattern("Booting Zephyr OS")
+ for shell_cmd in [
+ 'kernel stacks',
+ 'otp info conf',
+ 'otp info scu',
+ 'hwinfo devid',
+ 'crypto aes256_cbc_vault',
+ 'random get',
+ 'jtag JTAG1 sw_xfer high TMS',
+ 'adc ADC0 resolution 12',
+ 'adc ADC0 read 42',
+ 'adc ADC1 read 69',
+ 'i2c scan I2C_0',
+ 'i3c attach I3C_0',
+ 'hash test',
+ 'kernel uptime',
+ 'kernel reboot warm',
+ 'kernel uptime',
+ 'kernel reboot cold',
+ 'kernel uptime',
+ ]: exec_command_and_wait_for_pattern(self, shell_cmd, "uart:~$")
+
+
+if __name__ == '__main__':
+ LinuxKernelTest.main()
--
2.47.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 1/7] tests/functional: Introduce a specific test for ast1030 SoC
2024-12-06 13:11 ` [PATCH 1/7] tests/functional: Introduce a specific test for ast1030 SoC Cédric Le Goater
@ 2024-12-06 13:48 ` Thomas Huth
2024-12-09 6:47 ` Cédric Le Goater
0 siblings, 1 reply; 17+ messages in thread
From: Thomas Huth @ 2024-12-06 13:48 UTC (permalink / raw)
To: Cédric Le Goater, qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Philippe Mathieu-Daudé
On 06/12/2024 14.11, Cédric Le Goater wrote:
> This simply moves the ast1030 tests to a new test file. No changes.
>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
> tests/functional/meson.build | 2 +
> tests/functional/test_arm_aspeed.py | 64 ----------------
> tests/functional/test_arm_aspeed_ast1030.py | 81 +++++++++++++++++++++
> 3 files changed, 83 insertions(+), 64 deletions(-)
> create mode 100644 tests/functional/test_arm_aspeed_ast1030.py
>
> diff --git a/tests/functional/meson.build b/tests/functional/meson.build
> index d6d2c0196c76..ef593d4b9928 100644
> --- a/tests/functional/meson.build
> +++ b/tests/functional/meson.build
> @@ -18,6 +18,7 @@ test_timeouts = {
> 'aarch64_tuxrun' : 240,
> 'aarch64_virt' : 720,
> 'acpi_bits' : 420,
> + 'arm_aspeed_ast1030' : 10,
We've got a default timeout of 90 seconds (see the end of meson.build) ...
no need to set a smaller one, so I think you could simply drop this line.
With that line removed:
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 1/7] tests/functional: Introduce a specific test for ast1030 SoC
2024-12-06 13:48 ` Thomas Huth
@ 2024-12-09 6:47 ` Cédric Le Goater
0 siblings, 0 replies; 17+ messages in thread
From: Cédric Le Goater @ 2024-12-09 6:47 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Philippe Mathieu-Daudé
On 12/6/24 14:48, Thomas Huth wrote:
> On 06/12/2024 14.11, Cédric Le Goater wrote:
>> This simply moves the ast1030 tests to a new test file. No changes.
>>
>> Signed-off-by: Cédric Le Goater <clg@redhat.com>
>> ---
>> tests/functional/meson.build | 2 +
>> tests/functional/test_arm_aspeed.py | 64 ----------------
>> tests/functional/test_arm_aspeed_ast1030.py | 81 +++++++++++++++++++++
>> 3 files changed, 83 insertions(+), 64 deletions(-)
>> create mode 100644 tests/functional/test_arm_aspeed_ast1030.py
>>
>> diff --git a/tests/functional/meson.build b/tests/functional/meson.build
>> index d6d2c0196c76..ef593d4b9928 100644
>> --- a/tests/functional/meson.build
>> +++ b/tests/functional/meson.build
>> @@ -18,6 +18,7 @@ test_timeouts = {
>> 'aarch64_tuxrun' : 240,
>> 'aarch64_virt' : 720,
>> 'acpi_bits' : 420,
>> + 'arm_aspeed_ast1030' : 10,
>
> We've got a default timeout of 90 seconds (see the end of meson.build) ... no need to set a smaller one, so I think you could simply drop this line.
OK. I will drop this change before applying.
>
> With that line removed:
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
Thanks,
C.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/7] tests/functional: Introduce a specific test for palmetto-bmc machine
2024-12-06 13:11 [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
2024-12-06 13:11 ` [PATCH 1/7] tests/functional: Introduce a specific test for ast1030 SoC Cédric Le Goater
@ 2024-12-06 13:11 ` Cédric Le Goater
2024-12-06 13:52 ` Thomas Huth
2024-12-06 13:11 ` [PATCH 3/7] tests/functional: Introduce a specific test for romulus-bmc machine Cédric Le Goater
` (5 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Cédric Le Goater @ 2024-12-06 13:11 UTC (permalink / raw)
To: qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Thomas Huth, Philippe Mathieu-Daudé,
Cédric Le Goater
This introduces a new aspeed module for sharing code between tests and
moves the palmetto test to a new test file. No changes in the test.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
tests/functional/aspeed.py | 23 +++++++++++++++++++
tests/functional/meson.build | 2 ++
tests/functional/test_arm_aspeed.py | 10 --------
tests/functional/test_arm_aspeed_palmetto.py | 24 ++++++++++++++++++++
4 files changed, 49 insertions(+), 10 deletions(-)
create mode 100644 tests/functional/aspeed.py
create mode 100644 tests/functional/test_arm_aspeed_palmetto.py
diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
new file mode 100644
index 000000000000..d4dc5320b97a
--- /dev/null
+++ b/tests/functional/aspeed.py
@@ -0,0 +1,23 @@
+# Test class to boot aspeed machines
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from qemu_test import LinuxKernelTest
+
+class AspeedTest(LinuxKernelTest):
+
+ def do_test_arm_aspeed(self, machine, image):
+ self.set_machine(machine)
+ self.vm.set_console()
+ self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
+ '-net', 'nic', '-snapshot')
+ self.vm.launch()
+
+ self.wait_for_console_pattern("U-Boot 2016.07")
+ self.wait_for_console_pattern("## Loading kernel from FIT Image at 20080000")
+ self.wait_for_console_pattern("Starting kernel ...")
+ self.wait_for_console_pattern("Booting Linux on physical CPU 0x0")
+ self.wait_for_console_pattern(
+ "aspeed-smc 1e620000.spi: read control register: 203b0641")
+ self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")
+ self.wait_for_console_pattern("systemd[1]: Set hostname to")
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index ef593d4b9928..3cd079f910a8 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -19,6 +19,7 @@ test_timeouts = {
'aarch64_virt' : 720,
'acpi_bits' : 420,
'arm_aspeed_ast1030' : 10,
+ 'arm_aspeed_palmetto' : 120,
'arm_aspeed' : 600,
'arm_bpim2u' : 500,
'arm_collie' : 180,
@@ -68,6 +69,7 @@ tests_alpha_system_thorough = [
tests_arm_system_thorough = [
'arm_aspeed',
'arm_aspeed_ast1030',
+ 'arm_aspeed_palmetto',
'arm_bpim2u',
'arm_canona1100',
'arm_collie',
diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
index 9e58fcd84009..48a229608ef6 100755
--- a/tests/functional/test_arm_aspeed.py
+++ b/tests/functional/test_arm_aspeed.py
@@ -37,16 +37,6 @@ def do_test_arm_aspeed(self, machine, image):
self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")
self.wait_for_console_pattern("systemd[1]: Set hostname to")
- ASSET_PALMETTO_FLASH = Asset(
- ('https://github.com/openbmc/openbmc/releases/download/2.9.0/'
- 'obmc-phosphor-image-palmetto.static.mtd'),
- '3e13bbbc28e424865dc42f35ad672b10f2e82cdb11846bb28fa625b48beafd0d');
-
- def test_arm_ast2400_palmetto_openbmc_v2_9_0(self):
- image_path = self.ASSET_PALMETTO_FLASH.fetch()
-
- self.do_test_arm_aspeed('palmetto-bmc', image_path)
-
ASSET_ROMULUS_FLASH = Asset(
('https://github.com/openbmc/openbmc/releases/download/2.9.0/'
'obmc-phosphor-image-romulus.static.mtd'),
diff --git a/tests/functional/test_arm_aspeed_palmetto.py b/tests/functional/test_arm_aspeed_palmetto.py
new file mode 100644
index 000000000000..6588c02aad79
--- /dev/null
+++ b/tests/functional/test_arm_aspeed_palmetto.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+#
+# Functional test that boots the ASPEED machines
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from qemu_test import Asset
+from aspeed import AspeedTest
+
+class PalmettoMachine(AspeedTest):
+
+ ASSET_PALMETTO_FLASH = Asset(
+ ('https://github.com/openbmc/openbmc/releases/download/2.9.0/'
+ 'obmc-phosphor-image-palmetto.static.mtd'),
+ '3e13bbbc28e424865dc42f35ad672b10f2e82cdb11846bb28fa625b48beafd0d');
+
+ def test_arm_ast2400_palmetto_openbmc_v2_9_0(self):
+ image_path = self.ASSET_PALMETTO_FLASH.fetch()
+
+ self.do_test_arm_aspeed('palmetto-bmc', image_path)
+
+
+if __name__ == '__main__':
+ AspeedTest.main()
--
2.47.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 2/7] tests/functional: Introduce a specific test for palmetto-bmc machine
2024-12-06 13:11 ` [PATCH 2/7] tests/functional: Introduce a specific test for palmetto-bmc machine Cédric Le Goater
@ 2024-12-06 13:52 ` Thomas Huth
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-12-06 13:52 UTC (permalink / raw)
To: Cédric Le Goater, qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Philippe Mathieu-Daudé
On 06/12/2024 14.11, Cédric Le Goater wrote:
> This introduces a new aspeed module for sharing code between tests and
> moves the palmetto test to a new test file. No changes in the test.
>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
> tests/functional/aspeed.py | 23 +++++++++++++++++++
> tests/functional/meson.build | 2 ++
> tests/functional/test_arm_aspeed.py | 10 --------
> tests/functional/test_arm_aspeed_palmetto.py | 24 ++++++++++++++++++++
> 4 files changed, 49 insertions(+), 10 deletions(-)
> create mode 100644 tests/functional/aspeed.py
> create mode 100644 tests/functional/test_arm_aspeed_palmetto.py
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 3/7] tests/functional: Introduce a specific test for romulus-bmc machine
2024-12-06 13:11 [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
2024-12-06 13:11 ` [PATCH 1/7] tests/functional: Introduce a specific test for ast1030 SoC Cédric Le Goater
2024-12-06 13:11 ` [PATCH 2/7] tests/functional: Introduce a specific test for palmetto-bmc machine Cédric Le Goater
@ 2024-12-06 13:11 ` Cédric Le Goater
2024-12-06 13:59 ` Thomas Huth
2024-12-06 13:11 ` [PATCH 4/7] tests/functional: Introduce a specific test for ast2500 SoC Cédric Le Goater
` (4 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Cédric Le Goater @ 2024-12-06 13:11 UTC (permalink / raw)
To: qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Thomas Huth, Philippe Mathieu-Daudé,
Cédric Le Goater
This simply moves the romulus-bmc test to a new test file. No changes
in the test. The do_test_arm_aspeed routine is removed from the
test_arm_aspeed.py file because it is now unused.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
tests/functional/meson.build | 2 ++
tests/functional/test_arm_aspeed.py | 26 ---------------------
tests/functional/test_arm_aspeed_romulus.py | 24 +++++++++++++++++++
3 files changed, 26 insertions(+), 26 deletions(-)
create mode 100644 tests/functional/test_arm_aspeed_romulus.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 3cd079f910a8..65eda5a394bc 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -20,6 +20,7 @@ test_timeouts = {
'acpi_bits' : 420,
'arm_aspeed_ast1030' : 10,
'arm_aspeed_palmetto' : 120,
+ 'arm_aspeed_romulus' : 120,
'arm_aspeed' : 600,
'arm_bpim2u' : 500,
'arm_collie' : 180,
@@ -70,6 +71,7 @@ tests_arm_system_thorough = [
'arm_aspeed',
'arm_aspeed_ast1030',
'arm_aspeed_palmetto',
+ 'arm_aspeed_romulus',
'arm_bpim2u',
'arm_canona1100',
'arm_collie',
diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
index 48a229608ef6..bdc000a00a32 100755
--- a/tests/functional/test_arm_aspeed.py
+++ b/tests/functional/test_arm_aspeed.py
@@ -21,32 +21,6 @@
class AST2x00Machine(LinuxKernelTest):
- def do_test_arm_aspeed(self, machine, image):
- self.set_machine(machine)
- self.vm.set_console()
- self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
- '-net', 'nic', '-snapshot')
- self.vm.launch()
-
- self.wait_for_console_pattern("U-Boot 2016.07")
- self.wait_for_console_pattern("## Loading kernel from FIT Image at 20080000")
- self.wait_for_console_pattern("Starting kernel ...")
- self.wait_for_console_pattern("Booting Linux on physical CPU 0x0")
- self.wait_for_console_pattern(
- "aspeed-smc 1e620000.spi: read control register: 203b0641")
- self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")
- self.wait_for_console_pattern("systemd[1]: Set hostname to")
-
- ASSET_ROMULUS_FLASH = Asset(
- ('https://github.com/openbmc/openbmc/releases/download/2.9.0/'
- 'obmc-phosphor-image-romulus.static.mtd'),
- '820341076803f1955bc31e647a512c79f9add4f5233d0697678bab4604c7bb25')
-
- def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
- image_path = self.ASSET_ROMULUS_FLASH.fetch()
-
- self.do_test_arm_aspeed('romulus-bmc', image_path)
-
def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
self.require_netdev('user')
self.vm.set_console()
diff --git a/tests/functional/test_arm_aspeed_romulus.py b/tests/functional/test_arm_aspeed_romulus.py
new file mode 100644
index 000000000000..747b616201ce
--- /dev/null
+++ b/tests/functional/test_arm_aspeed_romulus.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+#
+# Functional test that boots the ASPEED machines
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from qemu_test import Asset
+from aspeed import AspeedTest
+
+class RomulusMachine(AspeedTest):
+
+ ASSET_ROMULUS_FLASH = Asset(
+ ('https://github.com/openbmc/openbmc/releases/download/2.9.0/'
+ 'obmc-phosphor-image-romulus.static.mtd'),
+ '820341076803f1955bc31e647a512c79f9add4f5233d0697678bab4604c7bb25')
+
+ def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
+ image_path = self.ASSET_ROMULUS_FLASH.fetch()
+
+ self.do_test_arm_aspeed('romulus-bmc', image_path)
+
+
+if __name__ == '__main__':
+ AspeedTest.main()
--
2.47.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 3/7] tests/functional: Introduce a specific test for romulus-bmc machine
2024-12-06 13:11 ` [PATCH 3/7] tests/functional: Introduce a specific test for romulus-bmc machine Cédric Le Goater
@ 2024-12-06 13:59 ` Thomas Huth
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-12-06 13:59 UTC (permalink / raw)
To: Cédric Le Goater, qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Philippe Mathieu-Daudé
On 06/12/2024 14.11, Cédric Le Goater wrote:
> This simply moves the romulus-bmc test to a new test file. No changes
> in the test. The do_test_arm_aspeed routine is removed from the
> test_arm_aspeed.py file because it is now unused.
>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
> tests/functional/meson.build | 2 ++
> tests/functional/test_arm_aspeed.py | 26 ---------------------
> tests/functional/test_arm_aspeed_romulus.py | 24 +++++++++++++++++++
> 3 files changed, 26 insertions(+), 26 deletions(-)
> create mode 100644 tests/functional/test_arm_aspeed_romulus.py
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 4/7] tests/functional: Introduce a specific test for ast2500 SoC
2024-12-06 13:11 [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
` (2 preceding siblings ...)
2024-12-06 13:11 ` [PATCH 3/7] tests/functional: Introduce a specific test for romulus-bmc machine Cédric Le Goater
@ 2024-12-06 13:11 ` Cédric Le Goater
2024-12-06 14:01 ` Thomas Huth
2024-12-06 13:11 ` [PATCH 5/7] tests/functional: Introduce a specific test for ast2600 SoC Cédric Le Goater
` (3 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Cédric Le Goater @ 2024-12-06 13:11 UTC (permalink / raw)
To: qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Thomas Huth, Philippe Mathieu-Daudé,
Cédric Le Goater
This moves the ast2500-evb tests to a new test file and extends the
aspeed module with routines used to run the buildroot and sdk
tests. No changes in the test.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
tests/functional/aspeed.py | 33 ++++++++++++
tests/functional/meson.build | 2 +
tests/functional/test_arm_aspeed.py | 44 ---------------
tests/functional/test_arm_aspeed_ast2500.py | 59 +++++++++++++++++++++
4 files changed, 94 insertions(+), 44 deletions(-)
create mode 100644 tests/functional/test_arm_aspeed_ast2500.py
diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
index d4dc5320b97a..62f50bab7a33 100644
--- a/tests/functional/aspeed.py
+++ b/tests/functional/aspeed.py
@@ -2,6 +2,7 @@
#
# SPDX-License-Identifier: GPL-2.0-or-later
+from qemu_test import exec_command_and_wait_for_pattern
from qemu_test import LinuxKernelTest
class AspeedTest(LinuxKernelTest):
@@ -21,3 +22,35 @@ def do_test_arm_aspeed(self, machine, image):
"aspeed-smc 1e620000.spi: read control register: 203b0641")
self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")
self.wait_for_console_pattern("systemd[1]: Set hostname to")
+
+ def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
+ self.require_netdev('user')
+ self.vm.set_console()
+ self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw,read-only=true',
+ '-net', 'nic', '-net', 'user')
+ self.vm.launch()
+
+ self.wait_for_console_pattern('U-Boot 2019.04')
+ self.wait_for_console_pattern('## Loading kernel from FIT Image')
+ self.wait_for_console_pattern('Starting kernel ...')
+ self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id)
+ self.wait_for_console_pattern('lease of 10.0.2.15')
+ # the line before login:
+ self.wait_for_console_pattern(pattern)
+ exec_command_and_wait_for_pattern(self, 'root', 'Password:')
+ exec_command_and_wait_for_pattern(self, 'passw0rd', '#')
+
+ def do_test_arm_aspeed_buildroot_poweroff(self):
+ exec_command_and_wait_for_pattern(self, 'poweroff',
+ 'reboot: System halted');
+
+ def do_test_arm_aspeed_sdk_start(self, image):
+ self.require_netdev('user')
+ self.vm.set_console()
+ self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
+ '-net', 'nic', '-net', 'user', '-snapshot')
+ self.vm.launch()
+
+ self.wait_for_console_pattern('U-Boot 2019.04')
+ self.wait_for_console_pattern('## Loading kernel from FIT Image')
+ self.wait_for_console_pattern('Starting kernel ...')
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 65eda5a394bc..6a9c20b30156 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -21,6 +21,7 @@ test_timeouts = {
'arm_aspeed_ast1030' : 10,
'arm_aspeed_palmetto' : 120,
'arm_aspeed_romulus' : 120,
+ 'arm_aspeed_ast2500' : 480,
'arm_aspeed' : 600,
'arm_bpim2u' : 500,
'arm_collie' : 180,
@@ -72,6 +73,7 @@ tests_arm_system_thorough = [
'arm_aspeed_ast1030',
'arm_aspeed_palmetto',
'arm_aspeed_romulus',
+ 'arm_aspeed_ast2500',
'arm_bpim2u',
'arm_canona1100',
'arm_collie',
diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
index bdc000a00a32..48cf0bfb27ca 100755
--- a/tests/functional/test_arm_aspeed.py
+++ b/tests/functional/test_arm_aspeed.py
@@ -41,34 +41,6 @@ def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'
def do_test_arm_aspeed_buildroot_poweroff(self):
exec_command_and_wait_for_pattern(self, 'poweroff',
'reboot: System halted');
-
- ASSET_BR2_202311_AST2500_FLASH = Asset(
- ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
- 'images/ast2500-evb/buildroot-2023.11/flash.img'),
- 'c23db6160cf77d0258397eb2051162c8473a56c441417c52a91ba217186e715f')
-
- def test_arm_ast2500_evb_buildroot(self):
- self.set_machine('ast2500-evb')
-
- image_path = self.ASSET_BR2_202311_AST2500_FLASH.fetch()
-
- self.vm.add_args('-device',
- 'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');
- self.do_test_arm_aspeed_buildroot_start(image_path, '0x0',
- 'ast2500-evb login:')
-
- exec_command_and_wait_for_pattern(self,
- 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-3/device/new_device',
- 'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d');
- exec_command_and_wait_for_pattern(self,
- 'cat /sys/class/hwmon/hwmon1/temp1_input', '0')
- self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
- property='temperature', value=18000);
- exec_command_and_wait_for_pattern(self,
- 'cat /sys/class/hwmon/hwmon1/temp1_input', '18000')
-
- self.do_test_arm_aspeed_buildroot_poweroff()
-
ASSET_BR2_202311_AST2600_FLASH = Asset(
('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
'images/ast2600-evb/buildroot-2023.11/flash.img'),
@@ -161,22 +133,6 @@ def do_test_arm_aspeed_sdk_start(self, image):
self.wait_for_console_pattern('## Loading kernel from FIT Image')
self.wait_for_console_pattern('Starting kernel ...')
- ASSET_SDK_V806_AST2500 = Asset(
- 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v08.06/ast2500-default-obmc.tar.gz',
- 'e1755f3cadff69190438c688d52dd0f0d399b70a1e14b1d3d5540fc4851d38ca')
-
- def test_arm_ast2500_evb_sdk(self):
- self.set_machine('ast2500-evb')
-
- image_path = self.ASSET_SDK_V806_AST2500.fetch()
-
- archive_extract(image_path, self.workdir)
-
- self.do_test_arm_aspeed_sdk_start(
- self.workdir + '/ast2500-default/image-bmc')
-
- self.wait_for_console_pattern('ast2500-default login:')
-
ASSET_SDK_V806_AST2600_A2 = Asset(
'https://github.com/AspeedTech-BMC/openbmc/releases/download/v08.06/ast2600-a2-obmc.tar.gz',
'9083506135f622d5e7351fcf7d4e1c7125cee5ba16141220c0ba88931f3681a4')
diff --git a/tests/functional/test_arm_aspeed_ast2500.py b/tests/functional/test_arm_aspeed_ast2500.py
new file mode 100644
index 000000000000..79baf37537e5
--- /dev/null
+++ b/tests/functional/test_arm_aspeed_ast2500.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+#
+# Functional test that boots the ASPEED machines
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from qemu_test import Asset
+from aspeed import AspeedTest
+from qemu_test import exec_command_and_wait_for_pattern
+from qemu_test.utils import archive_extract
+
+class AST2500Machine(AspeedTest):
+
+ ASSET_BR2_202311_AST2500_FLASH = Asset(
+ ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
+ 'images/ast2500-evb/buildroot-2023.11/flash.img'),
+ 'c23db6160cf77d0258397eb2051162c8473a56c441417c52a91ba217186e715f')
+
+ def test_arm_ast2500_evb_buildroot(self):
+ self.set_machine('ast2500-evb')
+
+ image_path = self.ASSET_BR2_202311_AST2500_FLASH.fetch()
+
+ self.vm.add_args('-device',
+ 'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');
+ self.do_test_arm_aspeed_buildroot_start(image_path, '0x0',
+ 'ast2500-evb login:')
+
+ exec_command_and_wait_for_pattern(self,
+ 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-3/device/new_device',
+ 'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d');
+ exec_command_and_wait_for_pattern(self,
+ 'cat /sys/class/hwmon/hwmon1/temp1_input', '0')
+ self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
+ property='temperature', value=18000);
+ exec_command_and_wait_for_pattern(self,
+ 'cat /sys/class/hwmon/hwmon1/temp1_input', '18000')
+
+ self.do_test_arm_aspeed_buildroot_poweroff()
+
+ ASSET_SDK_V806_AST2500 = Asset(
+ 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v08.06/ast2500-default-obmc.tar.gz',
+ 'e1755f3cadff69190438c688d52dd0f0d399b70a1e14b1d3d5540fc4851d38ca')
+
+ def test_arm_ast2500_evb_sdk(self):
+ self.set_machine('ast2500-evb')
+
+ image_path = self.ASSET_SDK_V806_AST2500.fetch()
+
+ archive_extract(image_path, self.workdir)
+
+ self.do_test_arm_aspeed_sdk_start(
+ self.workdir + '/ast2500-default/image-bmc')
+
+ self.wait_for_console_pattern('ast2500-default login:')
+
+
+if __name__ == '__main__':
+ AspeedTest.main()
--
2.47.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 4/7] tests/functional: Introduce a specific test for ast2500 SoC
2024-12-06 13:11 ` [PATCH 4/7] tests/functional: Introduce a specific test for ast2500 SoC Cédric Le Goater
@ 2024-12-06 14:01 ` Thomas Huth
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-12-06 14:01 UTC (permalink / raw)
To: Cédric Le Goater, qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Philippe Mathieu-Daudé
On 06/12/2024 14.11, Cédric Le Goater wrote:
> This moves the ast2500-evb tests to a new test file and extends the
> aspeed module with routines used to run the buildroot and sdk
> tests. No changes in the test.
>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
> tests/functional/aspeed.py | 33 ++++++++++++
> tests/functional/meson.build | 2 +
> tests/functional/test_arm_aspeed.py | 44 ---------------
> tests/functional/test_arm_aspeed_ast2500.py | 59 +++++++++++++++++++++
> 4 files changed, 94 insertions(+), 44 deletions(-)
> create mode 100644 tests/functional/test_arm_aspeed_ast2500.py
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 5/7] tests/functional: Introduce a specific test for ast2600 SoC
2024-12-06 13:11 [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
` (3 preceding siblings ...)
2024-12-06 13:11 ` [PATCH 4/7] tests/functional: Introduce a specific test for ast2500 SoC Cédric Le Goater
@ 2024-12-06 13:11 ` Cédric Le Goater
2024-12-06 14:04 ` Thomas Huth
2024-12-06 13:11 ` [PATCH 6/7] tests/functional: Introduce a specific test for rainier-bmc machine Cédric Le Goater
` (2 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Cédric Le Goater @ 2024-12-06 13:11 UTC (permalink / raw)
To: qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Thomas Huth, Philippe Mathieu-Daudé,
Cédric Le Goater
This moves the ast2600-evb tests to a new test file. No changes in the
test. The routines used to run the buildroot and sdk tests are removed
from the test_arm_aspeed.py file because now unused.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
tests/functional/meson.build | 2 +
tests/functional/test_arm_aspeed.py | 155 --------------------
tests/functional/test_arm_aspeed_ast2600.py | 143 ++++++++++++++++++
3 files changed, 145 insertions(+), 155 deletions(-)
create mode 100644 tests/functional/test_arm_aspeed_ast2600.py
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 6a9c20b30156..68df574ee72e 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -22,6 +22,7 @@ test_timeouts = {
'arm_aspeed_palmetto' : 120,
'arm_aspeed_romulus' : 120,
'arm_aspeed_ast2500' : 480,
+ 'arm_aspeed_ast2600' : 720,
'arm_aspeed' : 600,
'arm_bpim2u' : 500,
'arm_collie' : 180,
@@ -74,6 +75,7 @@ tests_arm_system_thorough = [
'arm_aspeed_palmetto',
'arm_aspeed_romulus',
'arm_aspeed_ast2500',
+ 'arm_aspeed_ast2600',
'arm_bpim2u',
'arm_canona1100',
'arm_collie',
diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
index 48cf0bfb27ca..8cf86795af3c 100755
--- a/tests/functional/test_arm_aspeed.py
+++ b/tests/functional/test_arm_aspeed.py
@@ -19,161 +19,6 @@
from zipfile import ZipFile
from unittest import skipUnless
-class AST2x00Machine(LinuxKernelTest):
-
- def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
- self.require_netdev('user')
- self.vm.set_console()
- self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw,read-only=true',
- '-net', 'nic', '-net', 'user')
- self.vm.launch()
-
- self.wait_for_console_pattern('U-Boot 2019.04')
- self.wait_for_console_pattern('## Loading kernel from FIT Image')
- self.wait_for_console_pattern('Starting kernel ...')
- self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id)
- self.wait_for_console_pattern('lease of 10.0.2.15')
- # the line before login:
- self.wait_for_console_pattern(pattern)
- exec_command_and_wait_for_pattern(self, 'root', 'Password:')
- exec_command_and_wait_for_pattern(self, 'passw0rd', '#')
-
- def do_test_arm_aspeed_buildroot_poweroff(self):
- exec_command_and_wait_for_pattern(self, 'poweroff',
- 'reboot: System halted');
- ASSET_BR2_202311_AST2600_FLASH = Asset(
- ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
- 'images/ast2600-evb/buildroot-2023.11/flash.img'),
- 'b62808daef48b438d0728ee07662290490ecfa65987bb91294cafb1bb7ad1a68')
-
- def test_arm_ast2600_evb_buildroot(self):
- self.set_machine('ast2600-evb')
-
- image_path = self.ASSET_BR2_202311_AST2600_FLASH.fetch()
-
- self.vm.add_args('-device',
- 'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');
- self.vm.add_args('-device',
- 'ds1338,bus=aspeed.i2c.bus.3,address=0x32');
- self.vm.add_args('-device',
- 'i2c-echo,bus=aspeed.i2c.bus.3,address=0x42');
- self.do_test_arm_aspeed_buildroot_start(image_path, '0xf00',
- 'ast2600-evb login:')
-
- exec_command_and_wait_for_pattern(self,
- 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-3/device/new_device',
- 'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d');
- exec_command_and_wait_for_pattern(self,
- 'cat /sys/class/hwmon/hwmon1/temp1_input', '0')
- self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
- property='temperature', value=18000);
- exec_command_and_wait_for_pattern(self,
- 'cat /sys/class/hwmon/hwmon1/temp1_input', '18000')
-
- exec_command_and_wait_for_pattern(self,
- 'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-3/device/new_device',
- 'i2c i2c-3: new_device: Instantiated device ds1307 at 0x32');
- year = time.strftime("%Y")
- exec_command_and_wait_for_pattern(self, 'hwclock -f /dev/rtc1', year);
-
- exec_command_and_wait_for_pattern(self,
- 'echo slave-24c02 0x1064 > /sys/bus/i2c/devices/i2c-3/new_device',
- 'i2c i2c-3: new_device: Instantiated device slave-24c02 at 0x64');
- exec_command_and_wait_for_pattern(self,
- 'i2cset -y 3 0x42 0x64 0x00 0xaa i', '#');
- exec_command_and_wait_for_pattern(self,
- 'hexdump /sys/bus/i2c/devices/3-1064/slave-eeprom',
- '0000000 ffaa ffff ffff ffff ffff ffff ffff ffff');
- self.do_test_arm_aspeed_buildroot_poweroff()
-
- ASSET_BR2_202302_AST2600_TPM_FLASH = Asset(
- ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
- 'images/ast2600-evb/buildroot-2023.02-tpm/flash.img'),
- 'a46009ae8a5403a0826d607215e731a8c68d27c14c41e55331706b8f9c7bd997')
-
- @skipUnless(*has_cmd('swtpm'))
- def test_arm_ast2600_evb_buildroot_tpm(self):
- self.set_machine('ast2600-evb')
-
- image_path = self.ASSET_BR2_202302_AST2600_TPM_FLASH.fetch()
-
- tpmstate_dir = tempfile.TemporaryDirectory(prefix="qemu_")
- socket = os.path.join(tpmstate_dir.name, 'swtpm-socket')
-
- # We must put the TPM state dir in /tmp/, not the build dir,
- # because some distros use AppArmor to lock down swtpm and
- # restrict the set of locations it can access files in.
- subprocess.run(['swtpm', 'socket', '-d', '--tpm2',
- '--tpmstate', f'dir={tpmstate_dir.name}',
- '--ctrl', f'type=unixio,path={socket}'])
-
- self.vm.add_args('-chardev', f'socket,id=chrtpm,path={socket}')
- self.vm.add_args('-tpmdev', 'emulator,id=tpm0,chardev=chrtpm')
- self.vm.add_args('-device',
- 'tpm-tis-i2c,tpmdev=tpm0,bus=aspeed.i2c.bus.12,address=0x2e')
- self.do_test_arm_aspeed_buildroot_start(image_path, '0xf00', 'Aspeed AST2600 EVB')
-
- exec_command_and_wait_for_pattern(self,
- 'echo tpm_tis_i2c 0x2e > /sys/bus/i2c/devices/i2c-12/new_device',
- 'tpm_tis_i2c 12-002e: 2.0 TPM (device-id 0x1, rev-id 1)');
- exec_command_and_wait_for_pattern(self,
- 'cat /sys/class/tpm/tpm0/pcr-sha256/0',
- 'B804724EA13F52A9072BA87FE8FDCC497DFC9DF9AA15B9088694639C431688E0');
-
- self.do_test_arm_aspeed_buildroot_poweroff()
-
- def do_test_arm_aspeed_sdk_start(self, image):
- self.require_netdev('user')
- self.vm.set_console()
- self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
- '-net', 'nic', '-net', 'user', '-snapshot')
- self.vm.launch()
-
- self.wait_for_console_pattern('U-Boot 2019.04')
- self.wait_for_console_pattern('## Loading kernel from FIT Image')
- self.wait_for_console_pattern('Starting kernel ...')
-
- ASSET_SDK_V806_AST2600_A2 = Asset(
- 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v08.06/ast2600-a2-obmc.tar.gz',
- '9083506135f622d5e7351fcf7d4e1c7125cee5ba16141220c0ba88931f3681a4')
-
- def test_arm_ast2600_evb_sdk(self):
- self.set_machine('ast2600-evb')
-
- image_path = self.ASSET_SDK_V806_AST2600_A2.fetch()
-
- archive_extract(image_path, self.workdir)
-
- self.vm.add_args('-device',
- 'tmp105,bus=aspeed.i2c.bus.5,address=0x4d,id=tmp-test');
- self.vm.add_args('-device',
- 'ds1338,bus=aspeed.i2c.bus.5,address=0x32');
- self.do_test_arm_aspeed_sdk_start(
- self.workdir + '/ast2600-a2/image-bmc')
-
- self.wait_for_console_pattern('ast2600-a2 login:')
-
- exec_command_and_wait_for_pattern(self, 'root', 'Password:')
- exec_command_and_wait_for_pattern(self, '0penBmc', 'root@ast2600-a2:~#')
-
- exec_command_and_wait_for_pattern(self,
- 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-5/device/new_device',
- 'i2c i2c-5: new_device: Instantiated device lm75 at 0x4d');
- exec_command_and_wait_for_pattern(self,
- 'cat /sys/class/hwmon/hwmon19/temp1_input', '0')
- self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
- property='temperature', value=18000);
- exec_command_and_wait_for_pattern(self,
- 'cat /sys/class/hwmon/hwmon19/temp1_input', '18000')
-
- exec_command_and_wait_for_pattern(self,
- 'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-5/device/new_device',
- 'i2c i2c-5: new_device: Instantiated device ds1307 at 0x32');
- year = time.strftime("%Y")
- exec_command_and_wait_for_pattern(self,
- '/sbin/hwclock -f /dev/rtc1', year);
-
-
class AST2x00MachineMMC(LinuxKernelTest):
ASSET_RAINIER_EMMC = Asset(
diff --git a/tests/functional/test_arm_aspeed_ast2600.py b/tests/functional/test_arm_aspeed_ast2600.py
new file mode 100644
index 000000000000..74d025e0fc76
--- /dev/null
+++ b/tests/functional/test_arm_aspeed_ast2600.py
@@ -0,0 +1,143 @@
+#!/usr/bin/env python3
+#
+# Functional test that boots the ASPEED machines
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import os
+import time
+import tempfile
+import subprocess
+
+from qemu_test import Asset
+from aspeed import AspeedTest
+from qemu_test import exec_command_and_wait_for_pattern
+from qemu_test import has_cmd
+from qemu_test.utils import archive_extract
+from unittest import skipUnless
+
+class AST2600Machine(AspeedTest):
+
+ ASSET_BR2_202311_AST2600_FLASH = Asset(
+ ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
+ 'images/ast2600-evb/buildroot-2023.11/flash.img'),
+ 'b62808daef48b438d0728ee07662290490ecfa65987bb91294cafb1bb7ad1a68')
+
+ def test_arm_ast2600_evb_buildroot(self):
+ self.set_machine('ast2600-evb')
+
+ image_path = self.ASSET_BR2_202311_AST2600_FLASH.fetch()
+
+ self.vm.add_args('-device',
+ 'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');
+ self.vm.add_args('-device',
+ 'ds1338,bus=aspeed.i2c.bus.3,address=0x32');
+ self.vm.add_args('-device',
+ 'i2c-echo,bus=aspeed.i2c.bus.3,address=0x42');
+ self.do_test_arm_aspeed_buildroot_start(image_path, '0xf00',
+ 'ast2600-evb login:')
+
+ exec_command_and_wait_for_pattern(self,
+ 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-3/device/new_device',
+ 'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d');
+ exec_command_and_wait_for_pattern(self,
+ 'cat /sys/class/hwmon/hwmon1/temp1_input', '0')
+ self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
+ property='temperature', value=18000);
+ exec_command_and_wait_for_pattern(self,
+ 'cat /sys/class/hwmon/hwmon1/temp1_input', '18000')
+
+ exec_command_and_wait_for_pattern(self,
+ 'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-3/device/new_device',
+ 'i2c i2c-3: new_device: Instantiated device ds1307 at 0x32');
+ year = time.strftime("%Y")
+ exec_command_and_wait_for_pattern(self, 'hwclock -f /dev/rtc1', year);
+
+ exec_command_and_wait_for_pattern(self,
+ 'echo slave-24c02 0x1064 > /sys/bus/i2c/devices/i2c-3/new_device',
+ 'i2c i2c-3: new_device: Instantiated device slave-24c02 at 0x64');
+ exec_command_and_wait_for_pattern(self,
+ 'i2cset -y 3 0x42 0x64 0x00 0xaa i', '#');
+ exec_command_and_wait_for_pattern(self,
+ 'hexdump /sys/bus/i2c/devices/3-1064/slave-eeprom',
+ '0000000 ffaa ffff ffff ffff ffff ffff ffff ffff');
+ self.do_test_arm_aspeed_buildroot_poweroff()
+
+ ASSET_BR2_202302_AST2600_TPM_FLASH = Asset(
+ ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
+ 'images/ast2600-evb/buildroot-2023.02-tpm/flash.img'),
+ 'a46009ae8a5403a0826d607215e731a8c68d27c14c41e55331706b8f9c7bd997')
+
+ @skipUnless(*has_cmd('swtpm'))
+ def test_arm_ast2600_evb_buildroot_tpm(self):
+ self.set_machine('ast2600-evb')
+
+ image_path = self.ASSET_BR2_202302_AST2600_TPM_FLASH.fetch()
+
+ tpmstate_dir = tempfile.TemporaryDirectory(prefix="qemu_")
+ socket = os.path.join(tpmstate_dir.name, 'swtpm-socket')
+
+ # We must put the TPM state dir in /tmp/, not the build dir,
+ # because some distros use AppArmor to lock down swtpm and
+ # restrict the set of locations it can access files in.
+ subprocess.run(['swtpm', 'socket', '-d', '--tpm2',
+ '--tpmstate', f'dir={tpmstate_dir.name}',
+ '--ctrl', f'type=unixio,path={socket}'])
+
+ self.vm.add_args('-chardev', f'socket,id=chrtpm,path={socket}')
+ self.vm.add_args('-tpmdev', 'emulator,id=tpm0,chardev=chrtpm')
+ self.vm.add_args('-device',
+ 'tpm-tis-i2c,tpmdev=tpm0,bus=aspeed.i2c.bus.12,address=0x2e')
+ self.do_test_arm_aspeed_buildroot_start(image_path, '0xf00', 'Aspeed AST2600 EVB')
+
+ exec_command_and_wait_for_pattern(self,
+ 'echo tpm_tis_i2c 0x2e > /sys/bus/i2c/devices/i2c-12/new_device',
+ 'tpm_tis_i2c 12-002e: 2.0 TPM (device-id 0x1, rev-id 1)');
+ exec_command_and_wait_for_pattern(self,
+ 'cat /sys/class/tpm/tpm0/pcr-sha256/0',
+ 'B804724EA13F52A9072BA87FE8FDCC497DFC9DF9AA15B9088694639C431688E0');
+
+ self.do_test_arm_aspeed_buildroot_poweroff()
+
+ ASSET_SDK_V806_AST2600_A2 = Asset(
+ 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v08.06/ast2600-a2-obmc.tar.gz',
+ '9083506135f622d5e7351fcf7d4e1c7125cee5ba16141220c0ba88931f3681a4')
+
+ def test_arm_ast2600_evb_sdk(self):
+ self.set_machine('ast2600-evb')
+
+ image_path = self.ASSET_SDK_V806_AST2600_A2.fetch()
+
+ archive_extract(image_path, self.workdir)
+
+ self.vm.add_args('-device',
+ 'tmp105,bus=aspeed.i2c.bus.5,address=0x4d,id=tmp-test');
+ self.vm.add_args('-device',
+ 'ds1338,bus=aspeed.i2c.bus.5,address=0x32');
+ self.do_test_arm_aspeed_sdk_start(
+ self.workdir + '/ast2600-a2/image-bmc')
+
+ self.wait_for_console_pattern('ast2600-a2 login:')
+
+ exec_command_and_wait_for_pattern(self, 'root', 'Password:')
+ exec_command_and_wait_for_pattern(self, '0penBmc', 'root@ast2600-a2:~#')
+
+ exec_command_and_wait_for_pattern(self,
+ 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-5/device/new_device',
+ 'i2c i2c-5: new_device: Instantiated device lm75 at 0x4d');
+ exec_command_and_wait_for_pattern(self,
+ 'cat /sys/class/hwmon/hwmon19/temp1_input', '0')
+ self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
+ property='temperature', value=18000);
+ exec_command_and_wait_for_pattern(self,
+ 'cat /sys/class/hwmon/hwmon19/temp1_input', '18000')
+
+ exec_command_and_wait_for_pattern(self,
+ 'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-5/device/new_device',
+ 'i2c i2c-5: new_device: Instantiated device ds1307 at 0x32');
+ year = time.strftime("%Y")
+ exec_command_and_wait_for_pattern(self,
+ '/sbin/hwclock -f /dev/rtc1', year);
+
+if __name__ == '__main__':
+ AspeedTest.main()
--
2.47.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 5/7] tests/functional: Introduce a specific test for ast2600 SoC
2024-12-06 13:11 ` [PATCH 5/7] tests/functional: Introduce a specific test for ast2600 SoC Cédric Le Goater
@ 2024-12-06 14:04 ` Thomas Huth
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-12-06 14:04 UTC (permalink / raw)
To: Cédric Le Goater, qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Philippe Mathieu-Daudé
On 06/12/2024 14.11, Cédric Le Goater wrote:
> This moves the ast2600-evb tests to a new test file. No changes in the
> test. The routines used to run the buildroot and sdk tests are removed
> from the test_arm_aspeed.py file because now unused.
>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
> tests/functional/meson.build | 2 +
> tests/functional/test_arm_aspeed.py | 155 --------------------
> tests/functional/test_arm_aspeed_ast2600.py | 143 ++++++++++++++++++
> 3 files changed, 145 insertions(+), 155 deletions(-)
> create mode 100644 tests/functional/test_arm_aspeed_ast2600.py
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 6/7] tests/functional: Introduce a specific test for rainier-bmc machine
2024-12-06 13:11 [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
` (4 preceding siblings ...)
2024-12-06 13:11 ` [PATCH 5/7] tests/functional: Introduce a specific test for ast2600 SoC Cédric Le Goater
@ 2024-12-06 13:11 ` Cédric Le Goater
2024-12-09 11:59 ` Thomas Huth
2024-12-06 13:11 ` [PATCH 7/7] tests/functional: Move debian boot test from avocado Cédric Le Goater
2024-12-09 13:43 ` [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
7 siblings, 1 reply; 17+ messages in thread
From: Cédric Le Goater @ 2024-12-06 13:11 UTC (permalink / raw)
To: qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Thomas Huth, Philippe Mathieu-Daudé,
Cédric Le Goater
This simply moves the rainier-bmc test to a new test file. No changes
in the test. The test_arm_aspeed.py is deleted.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
tests/functional/meson.build | 4 ++--
...m_aspeed.py => test_arm_aspeed_rainier.py} | 22 +++++--------------
2 files changed, 7 insertions(+), 19 deletions(-)
rename tests/functional/{test_arm_aspeed.py => test_arm_aspeed_rainier.py} (71%)
mode change 100755 => 100644
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 68df574ee72e..b3775af70be6 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -23,7 +23,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,
@@ -70,12 +70,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
old mode 100755
new mode 100644
similarity index 71%
rename from tests/functional/test_arm_aspeed.py
rename to tests/functional/test_arm_aspeed_rainier.py
index 8cf86795af3c..a60274926d6f
--- 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 @@ def test_arm_aspeed_emmc_boot(self):
self.wait_for_console_pattern('IBM eBMC (OpenBMC for IBM Enterprise')
if __name__ == '__main__':
- LinuxKernelTest.main()
+ AspeedTest.main()
--
2.47.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 6/7] tests/functional: Introduce a specific test for rainier-bmc machine
2024-12-06 13:11 ` [PATCH 6/7] tests/functional: Introduce a specific test for rainier-bmc machine Cédric Le Goater
@ 2024-12-09 11:59 ` Thomas Huth
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-12-09 11:59 UTC (permalink / raw)
To: Cédric Le Goater, qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Philippe Mathieu-Daudé
On 06/12/2024 14.11, Cédric Le Goater wrote:
> This simply moves the rainier-bmc test to a new test file. No changes
> in the test. The test_arm_aspeed.py is deleted.
>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
> tests/functional/meson.build | 4 ++--
> ...m_aspeed.py => test_arm_aspeed_rainier.py} | 22 +++++--------------
> 2 files changed, 7 insertions(+), 19 deletions(-)
> rename tests/functional/{test_arm_aspeed.py => test_arm_aspeed_rainier.py} (71%)
> mode change 100755 => 100644
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 7/7] tests/functional: Move debian boot test from avocado
2024-12-06 13:11 [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
` (5 preceding siblings ...)
2024-12-06 13:11 ` [PATCH 6/7] tests/functional: Introduce a specific test for rainier-bmc machine Cédric Le Goater
@ 2024-12-06 13:11 ` Cédric Le Goater
2024-12-06 14:12 ` Thomas Huth
2024-12-09 13:43 ` [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
7 siblings, 1 reply; 17+ messages in thread
From: Cédric Le Goater @ 2024-12-06 13:11 UTC (permalink / raw)
To: qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Thomas Huth, Philippe Mathieu-Daudé,
Cédric Le Goater
This simply moves the debian boot test from the avocado testsuite to
the new functional testsuite. No changes in the test.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
tests/avocado/boot_linux_console.py | 26 ---------------------
tests/functional/test_arm_aspeed_rainier.py | 24 +++++++++++++++++++
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 12e24bb05a75..738dd5a8c4bf 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -470,29 +470,3 @@ def test_arm_quanta_gsj_initrd(self):
self.wait_for_console_pattern('CPU1: thread -1, cpu 1, socket 0')
self.wait_for_console_pattern(
'Give root password for system maintenance')
-
- def test_arm_ast2600_debian(self):
- """
- :avocado: tags=arch:arm
- :avocado: tags=machine:rainier-bmc
- """
- deb_url = ('http://snapshot.debian.org/archive/debian/'
- '20220606T211338Z/'
- 'pool/main/l/linux/'
- 'linux-image-5.17.0-2-armmp_5.17.6-1%2Bb1_armhf.deb')
- deb_hash = '8acb2b4439faedc2f3ed4bdb2847ad4f6e0491f73debaeb7f660c8abe4dcdc0e'
- deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash,
- algorithm='sha256')
- kernel_path = self.extract_from_deb(deb_path, '/boot/vmlinuz-5.17.0-2-armmp')
- dtb_path = self.extract_from_deb(deb_path,
- '/usr/lib/linux-image-5.17.0-2-armmp/aspeed-bmc-ibm-rainier.dtb')
-
- self.vm.set_console()
- self.vm.add_args('-kernel', kernel_path,
- '-dtb', dtb_path,
- '-net', 'nic')
- self.vm.launch()
- self.wait_for_console_pattern("Booting Linux on physical CPU 0xf00")
- self.wait_for_console_pattern("SMP: Total of 2 processors activated")
- self.wait_for_console_pattern("No filesystem could mount root")
-
diff --git a/tests/functional/test_arm_aspeed_rainier.py b/tests/functional/test_arm_aspeed_rainier.py
index a60274926d6f..b856aea6dbd7 100644
--- a/tests/functional/test_arm_aspeed_rainier.py
+++ b/tests/functional/test_arm_aspeed_rainier.py
@@ -36,5 +36,29 @@ def test_arm_aspeed_emmc_boot(self):
self.wait_for_console_pattern('mmcblk0: p1 p2 p3 p4 p5 p6 p7')
self.wait_for_console_pattern('IBM eBMC (OpenBMC for IBM Enterprise')
+ ASSET_DEBIAN_LINUX_ARMHF_DEB = Asset(
+ ('http://snapshot.debian.org/archive/debian/20220606T211338Z/pool/main/l/linux/linux-image-5.17.0-2-armmp_5.17.6-1%2Bb1_armhf.deb'),
+ '8acb2b4439faedc2f3ed4bdb2847ad4f6e0491f73debaeb7f660c8abe4dcdc0e')
+
+ def test_arm_debian_kernel_boot(self):
+ self.set_machine('rainier-bmc')
+
+ deb_path = self.ASSET_DEBIAN_LINUX_ARMHF_DEB.fetch()
+
+ kernel_path = self.extract_from_deb(deb_path, '/boot/vmlinuz-5.17.0-2-armmp')
+ dtb_path = self.extract_from_deb(deb_path,
+ '/usr/lib/linux-image-5.17.0-2-armmp/aspeed-bmc-ibm-rainier.dtb')
+
+ self.vm.set_console()
+ self.vm.add_args('-kernel', kernel_path,
+ '-dtb', dtb_path,
+ '-net', 'nic')
+ self.vm.launch()
+
+ self.wait_for_console_pattern("Booting Linux on physical CPU 0xf00")
+ self.wait_for_console_pattern("SMP: Total of 2 processors activated")
+ self.wait_for_console_pattern("No filesystem could mount root")
+
+
if __name__ == '__main__':
AspeedTest.main()
--
2.47.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 7/7] tests/functional: Move debian boot test from avocado
2024-12-06 13:11 ` [PATCH 7/7] tests/functional: Move debian boot test from avocado Cédric Le Goater
@ 2024-12-06 14:12 ` Thomas Huth
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-12-06 14:12 UTC (permalink / raw)
To: Cédric Le Goater, qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Philippe Mathieu-Daudé
On 06/12/2024 14.11, Cédric Le Goater wrote:
> This simply moves the debian boot test from the avocado testsuite to
> the new functional testsuite. No changes in the test.
>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 0/7] tests/functional: Split aspeed tests
2024-12-06 13:11 [PATCH 0/7] tests/functional: Split aspeed tests Cédric Le Goater
` (6 preceding siblings ...)
2024-12-06 13:11 ` [PATCH 7/7] tests/functional: Move debian boot test from avocado Cédric Le Goater
@ 2024-12-09 13:43 ` Cédric Le Goater
7 siblings, 0 replies; 17+ messages in thread
From: Cédric Le Goater @ 2024-12-09 13:43 UTC (permalink / raw)
To: Cédric Le Goater, qemu-devel, qemu-arm
Cc: Peter Maydell, Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery,
Joel Stanley, Thomas Huth, Philippe Mathieu-Daudé
On 12/6/24 14:11, Cédric Le Goater wrote:
> Hello,
>
> All functional tests of aspeed machine are run from a single test
> file. Splitting the tests will improve parallelism and allow us to
> set different timeouts.
>
> The timeout values were chosen from a (single cpu) run on a raspberry
> pi4 :
>
> func-arm-arm_aspeed_ast1030 2.52s
> func-arm-arm_aspeed_palmetto 50.54s
> func-arm-arm_aspeed_romulus 61.81s
> func-arm-arm_aspeed_rainier 127.23s
> func-arm-arm_aspeed_ast2500 378.60s
> func-arm-arm_aspeed_ast2600 559.13s
>
> Thanks,
>
> C.
>
> Cédric Le Goater (7):
> tests/functional: Introduce a specific test for ast1030 SoC
> tests/functional: Introduce a specific test for palmetto-bmc machine
> tests/functional: Introduce a specific test for romulus-bmc machine
> tests/functional: Introduce a specific test for ast2500 SoC
> tests/functional: Introduce a specific test for ast2600 SoC
> tests/functional: Introduce a specific test for rainier-bmc machine
> tests/functional: Move debian boot test from avocado
> > tests/avocado/boot_linux_console.py | 26 --
> tests/functional/aspeed.py | 56 +++
> tests/functional/meson.build | 14 +-
> tests/functional/test_arm_aspeed.py | 351 -------------------
> tests/functional/test_arm_aspeed_ast1030.py | 81 +++++
> tests/functional/test_arm_aspeed_ast2500.py | 59 ++++
> tests/functional/test_arm_aspeed_ast2600.py | 143 ++++++++
> tests/functional/test_arm_aspeed_palmetto.py | 24 ++
> tests/functional/test_arm_aspeed_rainier.py | 64 ++++
> tests/functional/test_arm_aspeed_romulus.py | 24 ++
> 10 files changed, 463 insertions(+), 379 deletions(-)
> create mode 100644 tests/functional/aspeed.py
> delete mode 100755 tests/functional/test_arm_aspeed.py
> create mode 100644 tests/functional/test_arm_aspeed_ast1030.py
> create mode 100644 tests/functional/test_arm_aspeed_ast2500.py
> create mode 100644 tests/functional/test_arm_aspeed_ast2600.py
> create mode 100644 tests/functional/test_arm_aspeed_palmetto.py
> create mode 100644 tests/functional/test_arm_aspeed_rainier.py
> create mode 100644 tests/functional/test_arm_aspeed_romulus.py
Applied to aspeed-next.
Thanks,
C.
^ permalink raw reply [flat|nested] 17+ messages in thread