Patchwork [2/2] scripts/test-remote-image: add value check for rootfs fstype, change method name used.

login
register
mail settings
Submitter Corneliu Stoicescu
Date June 23, 2014, 12:59 p.m.
Message ID <1403528385-4446-2-git-send-email-corneliux.stoicescu@intel.com>
Download mbox | patch
Permalink /patch/74235/
State Accepted
Commit e612e18e7768ccf3851200271613686ed12b6384
Headers show

Comments

Corneliu Stoicescu - June 23, 2014, 12:59 p.m.
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 <corneliux.stoicescu@intel.com>
---
 scripts/test-remote-image | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Patch

diff --git a/scripts/test-remote-image b/scripts/test-remote-image
index 6da6672..7d02a84 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"