summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAníbal Limón <limon.anibal@gmail.com>2016-02-21 12:31:50 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:06 +0000
commit2a410b225ab90d3655a4fd637ae77965c4c9fbfb (patch)
treeb3256cd3fe21fe16cf14a9144b7c15db45b2433e /meta/lib
parenteb1f8b9427c1b346c1113f74df678883e9b2c729 (diff)
downloadpoky-2a410b225ab90d3655a4fd637ae77965c4c9fbfb.tar.gz
classes/testsdk: Move the removal of bitbake PATH to eSDK context only
The removal of bitbake and scripts PATH is only needed by eSDK tests so move to eSDK context only. This also it's a support for eSDK update test because it needs to execute oe-publish-sdk from scripts. (From OE-Core rev: 4ae0c84568f39661722cbceba8ddab22cffe5003) 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/lib')
-rw-r--r--meta/lib/oeqa/oetest.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index 3e2ea0f874..3809ed722b 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -21,6 +21,7 @@ import logging
21import oeqa.runtime 21import oeqa.runtime
22import oeqa.sdkext 22import oeqa.sdkext
23from oeqa.utils.decorators import LogResults, gettag, getResults 23from oeqa.utils.decorators import LogResults, gettag, getResults
24from oeqa.utils import avoid_paths_in_environ
24 25
25logger = logging.getLogger("BitBake") 26logger = logging.getLogger("BitBake")
26 27
@@ -128,7 +129,16 @@ class oeSDKTest(oeTest):
128 return subprocess.check_output(". %s > /dev/null; %s;" % (self.tc.sdkenv, cmd), shell=True) 129 return subprocess.check_output(". %s > /dev/null; %s;" % (self.tc.sdkenv, cmd), shell=True)
129 130
130class oeSDKExtTest(oeSDKTest): 131class oeSDKExtTest(oeSDKTest):
131 pass 132 def _run(self, cmd):
133 # extensible sdk shows a warning if found bitbake in the path
134 # because can cause contamination, i.e. use devtool from
135 # poky/scripts instead of eSDK one.
136 env = os.environ.copy()
137 paths_to_avoid = ['bitbake/bin', 'poky/scripts']
138 env['PATH'] = avoid_paths_in_environ(paths_to_avoid)
139
140 return subprocess.check_output(". %s > /dev/null;"\
141 " %s;" % (self.tc.sdkenv, cmd), shell=True, env=env)
132 142
133def getmodule(pos=2): 143def getmodule(pos=2):
134 # stack returns a list of tuples containg frame information 144 # stack returns a list of tuples containg frame information