qemu-arm
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] tests/avocado/machine_aspeed.py: Reduce noise on the console


From: Philippe Mathieu-Daudé
Subject: Re: [PATCH] tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests
Date: Fri, 4 Nov 2022 10:41:54 +0100
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.4.1

On 4/11/22 08:53, Cédric Le Goater wrote:
The Aspeed SDK images are based on OpenBMC which starts a lot of
services. The output noise on the console can break from time to time
the test waiting for the logging prompt.

IIUC OpenBMC uses systemd, so you can mask pointless services from
the kernel cmdline. See for example test_arm_quanta_gsj():

 # Disable drivers and services that stall for a long time during boot,
 # to avoid running past the 90-second timeout. These may be removed
 # as the corresponding device support is added.
 kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + (
         'console=${console} '
         'mem=${mem} '
         'initcall_blacklist=npcm_i2c_bus_driver_init '
         'systemd.mask=systemd-random-seed.service '
         'systemd.mask=dropbearkey.service '
 )

Change the U-Boot bootargs variable to add "quiet" to the kernel
command line and reduce the output volume. This also drops the test on
the CPU id which was nice to have but not essential.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
  tests/avocado/machine_aspeed.py | 17 ++++++++++++-----
  1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py
index fba6527026..1fc385e1c8 100644
--- a/tests/avocado/machine_aspeed.py
+++ b/tests/avocado/machine_aspeed.py
@@ -12,6 +12,7 @@
  from avocado_qemu import wait_for_console_pattern
  from avocado_qemu import exec_command
  from avocado_qemu import exec_command_and_wait_for_pattern
+from avocado_qemu import interrupt_interactive_console_until_pattern
  from avocado.utils import archive
  from avocado import skipIf
@@ -182,6 +183,8 @@ def test_arm_ast2600_evb_buildroot(self): class AST2x00MachineSDK(QemuSystemTest): + EXTRA_BOOTARGS = ' quiet'

Maybe less bug-prone to handle the spaces around EXTRA_BOOTARGS where
the variable is used.

-    def do_test_arm_aspeed_sdk_start(self, image, cpu_id):
+    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',
@@ -202,9 +205,13 @@ def do_test_arm_aspeed_sdk_start(self, image, cpu_id):
          self.vm.launch()
self.wait_for_console_pattern('U-Boot 2019.04')
-        self.wait_for_console_pattern('## Loading kernel from FIT Image')
+        interrupt_interactive_console_until_pattern(
+            self, 'Hit any key to stop autoboot:', 'ast#')
+        exec_command_and_wait_for_pattern(
+            self, 'setenv bootargs ${bootargs}' + self.EXTRA_BOOTARGS, 'ast#')
+        exec_command_and_wait_for_pattern(
+            self, 'boot', '## Loading kernel from FIT Image')
          self.wait_for_console_pattern('Starting kernel ...')
-        self.wait_for_console_pattern('Booting Linux on physical CPU ' + 
cpu_id)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]