summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-09-14 23:14:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-16 15:24:02 +0100
commita7a6d0557975ac494f2ee67bc2390c659a65c37d (patch)
tree46b96b63108404906c05ffed4dc57549bb219bd7 /meta
parentcfe41123476089f98af4e40e2ea7d56d16499a79 (diff)
downloadpoky-a7a6d0557975ac494f2ee67bc2390c659a65c37d.tar.gz
oeqa/oetest: show stderr when running commands
To help debug failures, redirect stderr to stdout in oeSDKTest.run() and oeSDKExtTest.run(). (From OE-Core rev: 4cd143e0de7f0082f60f273f442f6255f28ec3e7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/oetest.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index cf7e8628d8..95d3bf72fc 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -152,13 +152,12 @@ class oeSDKTest(oeTest):
152 152
153 @classmethod 153 @classmethod
154 def hasHostPackage(self, pkg): 154 def hasHostPackage(self, pkg):
155
156 if re.search(pkg, oeTest.tc.hostpkgmanifest): 155 if re.search(pkg, oeTest.tc.hostpkgmanifest):
157 return True 156 return True
158 return False 157 return False
159 158
160 def _run(self, cmd): 159 def _run(self, cmd):
161 return subprocess.check_output(". %s > /dev/null; %s;" % (self.tc.sdkenv, cmd), shell=True).decode("utf-8") 160 return subprocess.check_output(". %s > /dev/null; %s;" % (self.tc.sdkenv, cmd), shell=True, stderr=subprocess.STDOUT).decode("utf-8")
162 161
163class oeSDKExtTest(oeSDKTest): 162class oeSDKExtTest(oeSDKTest):
164 def _run(self, cmd): 163 def _run(self, cmd):
@@ -170,7 +169,7 @@ class oeSDKExtTest(oeSDKTest):
170 env['PATH'] = avoid_paths_in_environ(paths_to_avoid) 169 env['PATH'] = avoid_paths_in_environ(paths_to_avoid)
171 170
172 return subprocess.check_output(". %s > /dev/null;"\ 171 return subprocess.check_output(". %s > /dev/null;"\
173 " %s;" % (self.tc.sdkenv, cmd), shell=True, env=env).decode("utf-8") 172 " %s;" % (self.tc.sdkenv, cmd), stderr=subprocess.STDOUT, shell=True, env=env).decode("utf-8")
174 173
175def getmodule(pos=2): 174def getmodule(pos=2):
176 # stack returns a list of tuples containg frame information 175 # stack returns a list of tuples containg frame information