alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/build_test_better_errors' into 'master'

Browse Source 
test(build_system): print failed command and output when test fails

See merge request espressif/esp-idf!32962
This commit is contained in:
Ivan Grokhotkov 2024-09-10 15:18:41 +08:00
commit f789b4eb45
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/test_build_system/test_build_system_helpers/idf_utils.py
View File

@ -90,10 +90,17 @@ def run_idf_py(*args: str,
] ]
cmd += args # type: ignore cmd += args # type: ignore
logging.debug('running {} in {}'.format(' '.join(cmd), workdir)) logging.debug('running {} in {}'.format(' '.join(cmd), workdir))
return subprocess.run( try:
cmd, env=env, cwd=workdir, return subprocess.run(
check=check, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cmd, env=env, cwd=workdir,
text=True, encoding='utf-8', errors='backslashreplace', input=input_str) check=check, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
text=True, encoding='utf-8', errors='backslashreplace', input=input_str)
except subprocess.CalledProcessError as e:
logging.error('The following idf.py command has failed: {}'.format(' '.join(cmd)))
logging.error('Working directory: {}'.format(workdir))
logging.error('Stdout: {}'.format(e.stdout))
logging.error('Stderr: {}'.format(e.stderr))
raise
def run_cmake(*cmake_args: str, def run_cmake(*cmake_args: str,
@ -120,10 +127,17 @@ def run_cmake(*cmake_args: str,
cmd = ['cmake'] + list(cmake_args) cmd = ['cmake'] + list(cmake_args)
logging.debug('running {} in {}'.format(' '.join(cmd), build_dir)) logging.debug('running {} in {}'.format(' '.join(cmd), build_dir))
return subprocess.run( try:
cmd, env=env, cwd=build_dir, return subprocess.run(
check=check, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cmd, env=env, cwd=build_dir,
text=True, encoding='utf-8', errors='backslashreplace') check=check, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
text=True, encoding='utf-8', errors='backslashreplace')
except subprocess.CalledProcessError as e:
logging.error('The following cmake command has failed: {}'.format(' '.join(cmd)))
logging.error('Working directory: {}'.format(workdir))
logging.error('Stdout: {}'.format(e.stdout))
logging.error('Stderr: {}'.format(e.stderr))
raise
def run_cmake_and_build(*cmake_args: str, env: typing.Optional[EnvDict] = None) -> None: def run_cmake_and_build(*cmake_args: str, env: typing.Optional[EnvDict] = None) -> None: