espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/diag_exec_cmd' into 'master'

Browse Source 
fix(tools): allow to save stdout and stderr if the exec command fails

Closes IDF-12099

See merge request espressif/esp-idf!36626
This commit is contained in:
Roland Dobai
2025-01-24 23:27:45 +08:00
parent e65c9a52e8 88c099d756
commit 3a30e43c27
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/idf_py_actions/diag_ext.py
View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import atexit import atexit
import difflib import difflib
@@ -583,9 +583,10 @@ def cmd_exec(args: Dict, step: Dict, recipe: Dict) -> None:
if p.returncode: if p.returncode:
warn(f'Exec command "{cmd}" failed with exit code {p.returncode}') warn(f'Exec command "{cmd}" failed with exit code {p.returncode}')
return if p.stderr:
dbg(f'stderr: "{p.stderr}"')
if stdout: if stdout and p.stdout:
try: try:
stdout_path.parent.mkdir(parents=True, exist_ok=True) stdout_path.parent.mkdir(parents=True, exist_ok=True)
with open(stdout_path, 'a' if append else 'w') as f: with open(stdout_path, 'a' if append else 'w') as f:
@@ -593,7 +594,7 @@ def cmd_exec(args: Dict, step: Dict, recipe: Dict) -> None:
except Exception: except Exception:
warn(f'Cannot write exec command "{cmd}" stdout to "{stdout}"') warn(f'Cannot write exec command "{cmd}" stdout to "{stdout}"')
if stderr: if stderr and p.stderr:
try: try:
stderr_path.parent.mkdir(parents=True, exist_ok=True) stderr_path.parent.mkdir(parents=True, exist_ok=True)
with open(stderr_path, 'a' if append else 'w') as f: with open(stderr_path, 'a' if append else 'w') as f: