| Message ID | 20230119123449.531826-8-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | aspeed: Various extensions, fixes and cleanups | expand |
On Thu, 19 Jan 2023 at 12:39, Cédric Le Goater <clg@kaod.org> wrote: > > Signed-off-by: Cédric Le Goater <clg@kaod.org> NIce! Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > tests/avocado/machine_aspeed.py | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py > index 773b1ff3a9..1cab946727 100644 > --- a/tests/avocado/machine_aspeed.py > +++ b/tests/avocado/machine_aspeed.py > @@ -183,7 +183,14 @@ def test_arm_ast2600_evb_buildroot(self): > > class AST2x00MachineSDK(QemuSystemTest): > > - EXTRA_BOOTARGS = ' quiet' > + EXTRA_BOOTARGS = ( > + 'quiet ' > + 'systemd.mask=org.openbmc.HostIpmi.service ' > + 'systemd.mask=xyz.openbmc_project.Chassis.Control.Power@0.service ' > + 'systemd.mask=modprobe@fuse.service ' > + 'systemd.mask=rngd.service ' > + 'systemd.mask=obmc-console@ttyS2.service ' > + ) > > # FIXME: Although these tests boot a whole distro they are still > # slower than comparable machine models. There may be some > @@ -208,7 +215,7 @@ def do_test_arm_aspeed_sdk_start(self, 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#') > + 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 ...') > -- > 2.39.0 > >
diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py index 773b1ff3a9..1cab946727 100644 --- a/tests/avocado/machine_aspeed.py +++ b/tests/avocado/machine_aspeed.py @@ -183,7 +183,14 @@ def test_arm_ast2600_evb_buildroot(self): class AST2x00MachineSDK(QemuSystemTest): - EXTRA_BOOTARGS = ' quiet' + EXTRA_BOOTARGS = ( + 'quiet ' + 'systemd.mask=org.openbmc.HostIpmi.service ' + 'systemd.mask=xyz.openbmc_project.Chassis.Control.Power@0.service ' + 'systemd.mask=modprobe@fuse.service ' + 'systemd.mask=rngd.service ' + 'systemd.mask=obmc-console@ttyS2.service ' + ) # FIXME: Although these tests boot a whole distro they are still # slower than comparable machine models. There may be some @@ -208,7 +215,7 @@ def do_test_arm_aspeed_sdk_start(self, 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#') + 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 ...')
Signed-off-by: Cédric Le Goater <clg@kaod.org> --- tests/avocado/machine_aspeed.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)