summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/testsdk.bbclass9
-rw-r--r--meta/lib/oeqa/oetest.py12
2 files changed, 15 insertions, 6 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 41e03d6e06..157077e18e 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -96,11 +96,10 @@ def testsdkext_main(d):
96 # extensible sdk use network 96 # extensible sdk use network
97 export_proxies(d) 97 export_proxies(d)
98 98
99 # extensible sdk shows a warning if found bitbake in the path 99 # extensible sdk can be contaminated if native programs are
100 # because can cause problems so clean it 100 # in PATH, i.e. use perl-native instead of eSDK one.
101 paths_to_avoid = ['bitbake/bin', 'poky/scripts', 101 paths_to_avoid = [d.getVar('STAGING_DIR', True),
102 d.getVar('STAGING_DIR', True), 102 d.getVar('BASE_WORKDIR', True)]
103 d.getVar('BASE_WORKDIR', True)]
104 os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) 103 os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid)
105 104
106 pn = d.getVar("PN", True) 105 pn = d.getVar("PN", True)
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