OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xtensa-build-zephyr.py: log environment changes only for `west build` 

As recommended by Andrey in #7364, reduce the noise and log the
environment only for the `west build` command - unless the log level is
increased with `-v`, then log for every command.

Also fix a very unlikely corner case where the caller would invoke
execute_command() with `check=None` and get the opposite effect.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2023-04-12 18:29:04 +00:00 committed by Kai Vehmanen
parent c8253afad9
commit 322d2cc08f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/xtensa-build-zephyr.py
View File

@ -273,14 +273,15 @@ def execute_command(*run_args, **run_kwargs):
output = f"{print_cwd}; running command:\n {print_args}"
env_arg = run_kwargs.get('env')
env_change = set(env_arg.items()) - set(os.environ.items()) if env_arg else None
if env_change:
if env_change and (run_kwargs.get('sof_log_env') or args.verbose >= 1):
output += "\n... with extra/modified environment:"
for k_v in env_change:
output += f"\n{k_v[0]}={k_v[1]}"
print(output, flush=True)
run_kwargs = {k: run_kwargs[k] for k in run_kwargs if not k.startswith("sof_")}
if run_kwargs.get('check') is None:
if not 'check' in run_kwargs:
run_kwargs['check'] = True
#pylint:disable=subprocess-run-check
@ -638,7 +639,7 @@ def build_platforms():
# Build
try:
execute_command(build_cmd, cwd=west_top, env=platf_build_environ)
execute_command(build_cmd, cwd=west_top, env=platf_build_environ, sof_log_env=True)
except subprocess.CalledProcessError as cpe:
zephyr_path = pathlib.Path(west_top, "zephyr")
if not os.path.exists(zephyr_path):