From 6d8366bd6145bf3ad484ed9fe4b1ddb4c499f72b Mon Sep 17 00:00:00 2001 From: Corneliu Stoicescu Date: Mon, 23 Jun 2014 15:59:45 +0300 Subject: scripts/test-remote-image: add value check for rootfs fstype, change method name used. As per change in the oeqa/targetcontrol.py's BaseTarget class, changing the use of get_image_fstype() to match_image_fstype(). Also because there is no longer a value check done by the target controller's match_image_fstype() method, we have to do one here. + one helper comment for the get_controller() method. Signed-off-by: Corneliu Stoicescu Signed-off-by: Richard Purdie --- scripts/test-remote-image | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/test-remote-image b/scripts/test-remote-image index 6da66724b9..7d02a84806 100755 --- a/scripts/test-remote-image +++ b/scripts/test-remote-image @@ -136,7 +136,7 @@ class AutoTargetProfile(BaseTargetProfile): self.set_manifest_file() self.set_extra_download_files() - + # Get the controller object that will be used by bitbake. def get_controller(self): from oeqa.controllers.testtargetloader import TestTargetLoader @@ -158,8 +158,13 @@ class AutoTargetProfile(BaseTargetProfile): def set_rootfs_file(self): image_fstypes = get_bb_var('IMAGE_FSTYPES').split(' ') - fstype = self.controller.get_image_fstype(d=None, image_fstypes=image_fstypes) - self.rootfs_file = self.image_name + '.' + fstype + # Get a matching value between target's IMAGE_FSTYPES and the image fstypes suppoerted by the target controller. + fstype = self.controller.match_image_fstype(d=None, image_fstypes=image_fstypes) + if fstype: + self.rootfs_file = self.image_name + '.' + fstype + else: + log.error("Could not get a compatible image fstype. Check that IMAGE_FSTYPES and the target controller's supported_image_fstypes fileds have common values.") + sys.exit(1) def set_manifest_file(self): self.manifest_file = self.image_name + ".manifest" -- cgit 1.2.3-korg