aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-06-23 15:59:44 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-24 19:53:00 +0100
commit50ddd5d0149666ad60133d8eb6cc789c5b97e5e4 (patch)
tree4badbb43cb56c52670c22c6627beec9e185414b1 /meta/lib/oeqa
parent01968e9244d0cf3deb1ec5cfb8e562d3b364add6 (diff)
downloadopenembedded-core-contrib-50ddd5d0149666ad60133d8eb6cc789c5b97e5e4.tar.gz
openembedded-core-contrib-50ddd5d0149666ad60133d8eb6cc789c5b97e5e4.tar.bz2
openembedded-core-contrib-50ddd5d0149666ad60133d8eb6cc789c5b97e5e4.zip
oeqa/targetcontrol.py: Separate the matching of supported image fstypes from the resulting value check.
Because we used a bb.fatal call inside the get_image_fstype classmethod, this caused problems when accessed without instantiating the object with a valid bb environment. Separating the matching part of the classmethod(that is usable by outside scripts) from the check of the resulting value. The matching is done within a new classmethod and the latter keeps the old method name and internal functionality, this way we don't have to change any other target controllers code. Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/targetcontrol.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 1464bf4047..cc582dd1ad 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -77,14 +77,21 @@ class BaseTarget(object):
return None
@classmethod
- def get_image_fstype(self, d, image_fstypes=None):
+ def match_image_fstype(self, d, image_fstypes=None):
if not image_fstypes:
image_fstypes = d.getVar('IMAGE_FSTYPES', True).split(' ')
possible_image_fstypes = [fstype for fstype in self.supported_image_fstypes if fstype in image_fstypes]
if possible_image_fstypes:
return possible_image_fstypes[0]
else:
- bb.fatal("no possible image_fstype could not be determined. IMAGE_FSTYPES=\"%s\" and supported_image_fstypes=\"%s\": " % (', '.join(map(str, image_fstypes)), ', '.join(map(str, self.supported_image_fstypes))))
+ return None
+
+ def get_image_fstype(self, d):
+ image_fstype = self.match_image_fstype(d)
+ if image_fstype:
+ return image_fstype
+ else:
+ bb.fatal("IMAGE_FSTYPES should contain a Target Controller supported image fstype: %s " % ', '.join(map(str, self.supported_image_fstypes)))
def restart(self, params=None):
self.stop()