diff mbox series

oeqa/runCmd: print stderr when that is a separate stream

Message ID 20241101091553.2872509-1-alex.kanavin@gmail.com
State Accepted, archived
Commit 72c747b37ccdd486ddae06e3d0a99fb2b93643ba
Headers show
Series oeqa/runCmd: print stderr when that is a separate stream | expand

Commit Message

Alexander Kanavin Nov. 1, 2024, 9:15 a.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

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.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oeqa/utils/commands.py | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index ca22d69f291..2a47f90e327 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
 
     if result.status and not ignore_status:
         exc_output = result.output
+        if result.error:
+            exc_output = exc_output + result.error
         if limit_exc_output > 0:
             split = result.output.splitlines()
             if len(split) > limit_exc_output: