Check Uncrustify returncode in code_style.py

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2023-01-04 18:33:25 +00:00
parent cb3b6ae580
commit c571c5b1f0

View file

@ -106,8 +106,12 @@ def check_style_is_correct(src_file_list: List[str]) -> bool:
style_correct = True
for src_file in src_file_list:
uncrustify_cmd = [UNCRUSTIFY_EXE] + UNCRUSTIFY_ARGS + [src_file]
subprocess.run(uncrustify_cmd, stdout=subprocess.PIPE, \
result = subprocess.run(uncrustify_cmd, stdout=subprocess.PIPE, \
stderr=subprocess.PIPE, check=False)
if result.returncode != 0:
print_err("Uncrustify returned " + str(result.returncode) + \
" correcting file " + src_file)
return False
# Uncrustify makes changes to the code and places the result in a new
# file with the extension ".uncrustify". To get the changes (if any)
@ -135,15 +139,22 @@ def fix_style_single_pass(src_file_list: List[str]) -> None:
code_change_args = UNCRUSTIFY_ARGS + ["--no-backup"]
for src_file in src_file_list:
uncrustify_cmd = [UNCRUSTIFY_EXE] + code_change_args + [src_file]
subprocess.run(uncrustify_cmd, check=False, stdout=STDOUT_UTF8, \
stderr=STDERR_UTF8)
result = subprocess.run(uncrustify_cmd, check=False, \
stdout=STDOUT_UTF8, stderr=STDERR_UTF8)
if result.returncode != 0:
print_err("Uncrustify with file returned: " + \
str(result.returncode) + " correcting file " + \
src_file)
return False
def fix_style(src_file_list: List[str]) -> int:
"""
Fix the code style. This takes 2 passes of Uncrustify.
"""
fix_style_single_pass(src_file_list)
fix_style_single_pass(src_file_list)
if fix_style_single_pass(src_file_list) != True:
return 1
if fix_style_single_pass(src_file_list) != True:
return 1
# Guard against future changes that cause the codebase to require
# more passes.