summaryrefslogtreecommitdiffstats
path: root/meta/classes
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:33:06 +0000
commiteb1f8b9427c1b346c1113f74df678883e9b2c729 (patch)
treea1f9fef22e1c79511e962dd9a092347971c81ea5 /meta/classes
parent55d4849e80df3caec88fcd251bc49ba355d1a99a (diff)
downloadpoky-eb1f8b9427c1b346c1113f74df678883e9b2c729.tar.gz
classes/testsdk: Move code for avoid PATHs to oeqa.utils
Due to the neeed to use in other modules. (From OE-Core rev: a25aef2bdefae54c8b3eb2bd4afec5a86110ddc7) Signed-off-by: Aníbal Limón <limon.anibal@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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):
88 import os 88 import os
89 import oeqa.sdkext 89 import oeqa.sdkext
90 import subprocess 90 import subprocess
91 from oeqa.oetest import SDKTestContext, SDKExtTestContext
92 from bb.utils import export_proxies 91 from bb.utils import export_proxies
92 from oeqa.oetest import SDKTestContext, SDKExtTestContext
93 from oeqa.utils import avoid_paths_in_environ
94
93 95
94 # extensible sdk use network 96 # extensible sdk use network
95 export_proxies(d) 97 export_proxies(d)
96 98
97 # extensible sdk shows a warning if found bitbake in the path 99 # extensible sdk shows a warning if found bitbake in the path
98 # because can cause problems so clean it 100 # because can cause problems so clean it
99 new_path = ''
100 paths_to_avoid = ['bitbake/bin', 'poky/scripts', 101 paths_to_avoid = ['bitbake/bin', 'poky/scripts',
101 d.getVar('STAGING_DIR', True), 102 d.getVar('STAGING_DIR', True),
102 d.getVar('BASE_WORKDIR', True)] 103 d.getVar('BASE_WORKDIR', True)]
103 for p in os.environ['PATH'].split(':'): 104 os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid)
104 avoid = False
105 for pa in paths_to_avoid:
106 if pa in p:
107 avoid = True
108 break
109 if avoid:
110 continue
111
112 new_path = new_path + p + ':'
113 new_path = new_path[:-1]
114 os.environ['PATH'] = new_path
115 105
116 pn = d.getVar("PN", True) 106 pn = d.getVar("PN", True)
117 bb.utils.mkdirhier(d.getVar("TEST_LOG_SDKEXT_DIR", True)) 107 bb.utils.mkdirhier(d.getVar("TEST_LOG_SDKEXT_DIR", True))