| Message ID | 20220331183117.22389-3-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/7] runfvp: propagate the exit code correctly | expand |
diff --git a/meta-arm/lib/oeqa/controllers/fvp.py b/meta-arm/lib/oeqa/controllers/fvp.py index 7136a003..2913f782 100644 --- a/meta-arm/lib/oeqa/controllers/fvp.py +++ b/meta-arm/lib/oeqa/controllers/fvp.py @@ -16,7 +16,9 @@ class OEFVPTarget(oeqa.core.target.ssh.OESSHTarget): **kwargs): super().__init__(logger, target_ip, server_ip, timeout, user, port) image_dir = pathlib.Path(dir_image) - basename = pathlib.Path(rootfs).stem + # rootfs may have multiple extensions so we need to strip *all* suffixes + basename = pathlib.Path(rootfs) + basename = basename.name.replace("".join(basename.suffixes), "") self.fvpconf = image_dir / (basename + ".fvpconf") if not self.fvpconf.exists():
Until testimage tells the controller the basename of the image, make sure to strip all suffixes from the image name to get the base name, not just one. Machines such as corstone500 have images called .wic.nopt, so just stripping one isn't sufficient. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta-arm/lib/oeqa/controllers/fvp.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)