summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils/commands.py
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-11-01 10:15:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-01 23:03:32 +0000
commit24c1a31481cd7d6702b4f1d70a6e87466f675d37 (patch)
treeeea1091fee3415efe0d0d2ab7e3eb8510bdc042f /meta/lib/oeqa/utils/commands.py
parent4322775ca4bfc7ee5d590154d70e34639e1bfe8e (diff)
downloadpoky-24c1a31481cd7d6702b4f1d70a6e87466f675d37.tar.gz
oeqa/runCmd: print stderr when that is a separate stream
runCmd by default merges stderr into stdout, and only needs to print stdout when errors occur. When stderr is requested as a separate stream, and an error occurs, stderr is discarded, obscuring useful error messages. This changes the output to include both streams. (From OE-Core rev: 72c747b37ccdd486ddae06e3d0a99fb2b93643ba) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/commands.py')
-rw-r--r--meta/lib/oeqa/utils/commands.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index ca22d69f29..2a47f90e32 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -203,6 +203,8 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, sync=T
203 203
204 if result.status and not ignore_status: 204 if result.status and not ignore_status:
205 exc_output = result.output 205 exc_output = result.output
206 if result.error:
207 exc_output = exc_output + result.error
206 if limit_exc_output > 0: 208 if limit_exc_output > 0:
207 split = result.output.splitlines() 209 split = result.output.splitlines()
208 if len(split) > limit_exc_output: 210 if len(split) > limit_exc_output: