mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00
Code Issues Projects Releases Wiki Activity

selftest: base: new object member to store the DISTRO value

Browse Source 
Instead of quering it multiple times, query once and use it on
test method skip checks. Also, rename current distro sstate object
member to a more meaninful name.

(From OE-Core rev: bde9d99575a63ad2d7fd5974ce6ce19aad9a8984)

Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Leonardo Sandoval
2016-11-18 11:27:19 -06:00
committed by Richard Purdie
parent a92d27acd8
commit 009adf73fa
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/base.py
+1
View File
@@ -41,6 +41,7 @@ class oeSelfTest(unittest.TestCase):
self.testinc_path, self.testinc_bblayers_path,
self.machineinc_path, self.localconf_backup,
self.local_bblayers_backup]
self.distro = get_bb_var('DISTRO')
super(oeSelfTest, self).__init__(methodName)
def setUp(self):
meta/lib/oeqa/selftest/sstate.py
+5 -5
View File
@@ -14,8 +14,8 @@ class SStateBase(oeSelfTest):
def setUpLocal(self):
self.temp_sstate_location = None
self.sstate_path = get_bb_var('SSTATE_DIR')
self.distro = get_bb_var('NATIVELSBSTRING')
self.distro_specific_sstate = os.path.join(self.sstate_path, self.distro)
self.hostdistro = get_bb_var('NATIVELSBSTRING')
self.distro_specific_sstate = os.path.join(self.sstate_path, self.hostdistro)
# Creates a special sstate configuration with the option to add sstate mirrors
def config_sstate(self, temp_sstate_location=False, add_local_mirrors=[]):
@@ -27,8 +27,8 @@ class SStateBase(oeSelfTest):
self.append_config(config_temp_sstate)
self.track_for_cleanup(temp_sstate_path)
self.sstate_path = get_bb_var('SSTATE_DIR')
self.distro = get_bb_var('NATIVELSBSTRING')
self.distro_specific_sstate = os.path.join(self.sstate_path, self.distro)
self.hostdistro = get_bb_var('NATIVELSBSTRING')
self.distro_specific_sstate = os.path.join(self.sstate_path, self.hostdistro)
if add_local_mirrors:
config_set_sstate_if_not_set = 'SSTATE_MIRRORS ?= ""'
@@ -42,7 +42,7 @@ class SStateBase(oeSelfTest):
def search_sstate(self, filename_regex, distro_specific=True, distro_nonspecific=True):
result = []
for root, dirs, files in os.walk(self.sstate_path):
if distro_specific and re.search("%s/[a-z0-9]{2}$" % self.distro, root):
if distro_specific and re.search("%s/[a-z0-9]{2}$" % self.hostdistro, root):
for f in files:
if re.search(filename_regex, f):
result.append(f)