On Thu, 19 Jun 2025 at 15:15, Philippe Mathieu-Daudé <phi...@linaro.org> wrote: > > fetch_firmware() is only about fetching firmware. > Set the machine type in test_sbsaref_edk2_firmware(). > > Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> > --- > tests/functional/test_aarch64_sbsaref.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/functional/test_aarch64_sbsaref.py > b/tests/functional/test_aarch64_sbsaref.py > index e6a55aecfac..5536ec622e6 100755 > --- a/tests/functional/test_aarch64_sbsaref.py > +++ b/tests/functional/test_aarch64_sbsaref.py > @@ -40,7 +40,6 @@ def fetch_firmware(test): > with open(path, "ab+") as fd: > fd.truncate(256 << 20) # Expand volumes to 256MiB > > - test.set_machine('sbsa-ref') > test.vm.set_console() > test.vm.add_args( > "-drive", f"if=pflash,file={fs0_path},format=raw", > @@ -70,6 +69,7 @@ def test_sbsaref_edk2_firmware(self): > > fetch_firmware(self) > > + self.set_machine('sbsa-ref') > self.vm.add_args('-cpu', 'cortex-a57') > self.vm.launch()
Sorry, last patch, I forgot to squash: -- >8 -- diff --git a/tests/functional/test_aarch64_sbsaref_alpine.py b/tests/functional/test_aarch64_sbsaref_alpine.py index 6108ec65a54..98762eedb67 100755 --- a/tests/functional/test_aarch64_sbsaref_alpine.py +++ b/tests/functional/test_aarch64_sbsaref_alpine.py @@ -32,2 +32,3 @@ def boot_alpine_linux(self, cpu=None): + self.set_machine('sbsa-ref') self.vm.set_console() diff --git a/tests/functional/test_aarch64_sbsaref_freebsd.py b/tests/functional/test_aarch64_sbsaref_freebsd.py index 26dfc5878bb..1c243d0d459 100755 --- a/tests/functional/test_aarch64_sbsaref_freebsd.py +++ b/tests/functional/test_aarch64_sbsaref_freebsd.py @@ -32,2 +32,3 @@ def boot_freebsd14(self, cpu=None): + self.set_machine('sbsa-ref') self.vm.set_console() ---