summaryrefslogtreecommitdiffstats
path: root/meta/classes/testsdk.bbclass
diff options
context:
space:
mode:
authorAníbal Limón <limon.anibal@gmail.com>2016-02-21 12:14:44 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:32:40 +0000
commita25aef2bdefae54c8b3eb2bd4afec5a86110ddc7 (patch)
treefea01911c432a84839776192b8ae6ff815509e5b /meta/classes/testsdk.bbclass
parentda5bc7c637668d284e58f7b7af5abfde47120a03 (diff)
downloadopenembedded-core-a25aef2bdefae54c8b3eb2bd4afec5a86110ddc7.tar.gz
openembedded-core-a25aef2bdefae54c8b3eb2bd4afec5a86110ddc7.tar.bz2
openembedded-core-a25aef2bdefae54c8b3eb2bd4afec5a86110ddc7.zip
classes/testsdk: Move code for avoid PATHs to oeqa.utils
Due to the neeed to use in other modules. Signed-off-by: Aníbal Limón <limon.anibal@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/testsdk.bbclass')
-rw-r--r--meta/classes/testsdk.bbclass18
1 files changed, 4 insertions, 14 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index a56ad5edfc..41e03d6e06 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -88,30 +88,20 @@ def testsdkext_main(d):
import os
import oeqa.sdkext
import subprocess
- from oeqa.oetest import SDKTestContext, SDKExtTestContext
from bb.utils import export_proxies
+ from oeqa.oetest import SDKTestContext, SDKExtTestContext
+ from oeqa.utils import avoid_paths_in_environ
+
# extensible sdk use network
export_proxies(d)
# extensible sdk shows a warning if found bitbake in the path
# because can cause problems so clean it
- new_path = ''
paths_to_avoid = ['bitbake/bin', 'poky/scripts',
d.getVar('STAGING_DIR', True),
d.getVar('BASE_WORKDIR', True)]
- for p in os.environ['PATH'].split(':'):
- avoid = False
- for pa in paths_to_avoid:
- if pa in p:
- avoid = True
- break
- if avoid:
- continue
-
- new_path = new_path + p + ':'
- new_path = new_path[:-1]
- os.environ['PATH'] = new_path
+ os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid)
pn = d.getVar("PN", True)
bb.utils.mkdirhier(d.getVar("TEST_LOG_SDKEXT_DIR", True))